Mercurial > hg > orthanc-stone

changeset 433:8999823db8b8 am-vsol-upgrade

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix SetSize in SDL
author am@osimis.io
date Mon, 03 Dec 2018 14:22:47 +0100
parents 4eb96c6b4e96
children 3a8bcc45c221
files Applications/Generic/NativeStoneApplicationContext.cpp Applications/Generic/NativeStoneApplicationContext.h
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Generic/NativeStoneApplicationContext.cpp	Mon Dec 03 13:53:29 2018 +0100
+++ b/Applications/Generic/NativeStoneApplicationContext.cpp	Mon Dec 03 14:22:47 2018 +0100
@@ -57,7 +57,7 @@
 
   void NativeStoneApplicationContext::Start()
   {
-    boost::mutex::scoped_lock lock(globalMutex_);
+    boost::recursive_mutex::scoped_lock lock(globalMutex_);
     
     if (stopped_ &&
         centralViewport_.HasAnimation())
--- a/Applications/Generic/NativeStoneApplicationContext.h	Mon Dec 03 13:53:29 2018 +0100
+++ b/Applications/Generic/NativeStoneApplicationContext.h	Mon Dec 03 14:22:47 2018 +0100
@@ -36,7 +36,7 @@
   private:
     static void UpdateThread(NativeStoneApplicationContext* that);
 
-    boost::mutex    globalMutex_;
+    boost::recursive_mutex    globalMutex_;
     WidgetViewport  centralViewport_;
     boost::thread   updateThread_;
     bool            stopped_;
@@ -46,8 +46,8 @@
     class GlobalMutexLocker: public boost::noncopyable
     {
     private:
-      NativeStoneApplicationContext&  that_;
-      boost::mutex::scoped_lock       lock_;
+      NativeStoneApplicationContext&        that_;
+      boost::recursive_mutex::scoped_lock   lock_;
       
     public:
       GlobalMutexLocker(NativeStoneApplicationContext& that) :