Mercurial > hg > orthanc-stone

diff Applications/IBasicApplication.cpp @ 53:c2dc924f1a63 wasm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removing threading out of the framework
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 27 Apr 2017 16:57:49 +0200
parents b340879da9bd
children d20e25cfcf3a
line wrap: on
line diff
--- a/Applications/IBasicApplication.cpp	Thu Apr 27 14:50:40 2017 +0200
+++ b/Applications/IBasicApplication.cpp	Thu Apr 27 16:57:49 2017 +0200
@@ -214,7 +214,11 @@
       BasicApplicationContext context(orthanc);
 
       application.Initialize(context, statusBar, parameters);
-      context.GetViewport().SetStatusBar(statusBar);
+
+      {
+        BasicApplicationContext::ViewportLocker locker(context);
+        locker.GetViewport().SetStatusBar(statusBar);
+      }
 
       std::string title = application.GetTitle();
       if (title.empty())
@@ -232,7 +236,7 @@
         LOG(WARNING) << "Starting the application";
 
         SdlWindow window(title.c_str(), width, height, opengl);
-        SdlEngine sdl(window, context.GetViewport());
+        SdlEngine sdl(window, context);
 
         sdl.Run();
 
@@ -248,7 +252,11 @@
 
       LOG(WARNING) << "The application has stopped";
 
-      context.GetViewport().ResetStatusBar();
+      {
+        BasicApplicationContext::ViewportLocker locker(context);
+        locker.GetViewport().ResetStatusBar();
+      }
+      
       application.Finalize();
     }
     catch (Orthanc::OrthancException& e)