# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1604402905 -3600
# Node ID 09ed936fd38195d2baa0f1d8e82b0a1fae5c4975
# Parent  0034f855c02309c49e7ae6bb66742715275f598e
cppcheck

diff -r 0034f855c023 -r 09ed936fd381 OrthancServer/Resources/RunCppCheck.sh
--- a/OrthancServer/Resources/RunCppCheck.sh	Tue Nov 03 12:24:50 2020 +0100
+++ b/OrthancServer/Resources/RunCppCheck.sh	Tue Nov 03 12:28:25 2020 +0100
@@ -19,7 +19,7 @@
 stlFindInsert:../../OrthancServer/Sources/ServerIndex.cpp:400
 syntaxError:../../OrthancFramework/Sources/SQLite/FunctionContext.h:50
 syntaxError:../../OrthancFramework/UnitTestsSources/ZipTests.cpp:129
-syntaxError:../../OrthancServer/UnitTestsSources/UnitTestsMain.cpp:314
+syntaxError:../../OrthancServer/UnitTestsSources/UnitTestsMain.cpp:337
 uninitMemberVar:../../OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp:427
 unreadVariable:../../OrthancFramework/Sources/FileStorage/StorageAccessor.cpp
 unreadVariable:../../OrthancServer/Sources/OrthancRestApi/OrthancRestModalities.cpp:714
diff -r 0034f855c023 -r 09ed936fd381 OrthancServer/Sources/ServerContext.cpp
--- a/OrthancServer/Sources/ServerContext.cpp	Tue Nov 03 12:24:50 2020 +0100
+++ b/OrthancServer/Sources/ServerContext.cpp	Tue Nov 03 12:28:25 2020 +0100
@@ -1441,11 +1441,11 @@
     {
       // Use Orthanc's built-in decoder, using the cache to speed-up
       // things on multi-frame images
-      ServerContext::DicomCacheLocker locker(*this, publicId);
 
       std::unique_ptr<ImageAccessor> decoded;
       try
       {
+        ServerContext::DicomCacheLocker locker(*this, publicId);
         decoded.reset(locker.GetDicom().DecodeFrame(frameIndex));
       }
       catch (OrthancException& e)