From ada1afbac2a232120e01f4977003544d3b75f091 Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Sun, 7 Apr 2019 11:27:43 +0200
Subject: [PATCH] fix mac RTL and app termination deadlock

---
 PanoPainter-OSX/main.cpp |  4 +---
 data/layout.xml          | 10 +++++-----
 src/app.cpp              |  7 ++++++-
 src/app_layout.cpp       |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/PanoPainter-OSX/main.cpp b/PanoPainter-OSX/main.cpp
index 22c7522..7eb7267 100644
--- a/PanoPainter-OSX/main.cpp
+++ b/PanoPainter-OSX/main.cpp
@@ -220,10 +220,8 @@ std::mutex task_mutex;
 
 - (void)terminateGL
 {
-    CGLLockContext([[self openGLContext] CGLContextObj]);
-    App::I.terminate();
-    CGLUnlockContext([[self openGLContext] CGLContextObj]);
     CVDisplayLinkRelease(dl);
+    App::I.terminate();
 }
 
 // This is the renderer output callback function
diff --git a/data/layout.xml b/data/layout.xml
index 88d8d73..bd51a7e 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -1634,7 +1634,7 @@ Here's a list of what's available in this release.
         </node>
       </border>
       <!-- toolbar -->
-      <border id="toolbar" height="50" width="100%" pad="5" dir="row" color="0 0 0 0.6" mouse-capture="true">
+      <border id="toolbar" height="50" width="100%" pad="5" dir="row" color="0 0 0 0.6" mouse-capture="true" rtl="ltr">
         <!--
         <button id="btn-open" width="50" height="100%" margin="0 5 0 0" text="Open"/>
         <button id="btn-save" width="50" height="100%" margin="0 5 0 0" text="Save"/>
@@ -1736,17 +1736,17 @@ Here's a list of what's available in this release.
           </node>
         </border>
 
-        <scroll id="drop-left" color="0 0 0 .6" min-width="10" mouse-capture="true"/>
+        <scroll id="drop-left" color="0 0 0 .6" min-width="10" mouse-capture="true" rtl="ltr"/>
         
         <!--quick bar-->
-        <node justify="center" align="center" dir="col">
+        <node justify="center" align="center" dir="col" rtl="ltr">
           <panel-quick id="panel-quick"/>
           <node height="0" grow="1" max-height="50"/>
         </node>
 
-        <node id="floatings" color="0 0 0 1" width="1" grow="1" height="100%"/>
+        <node id="floatings" color="0 0 0 1" width="1" grow="1" height="100%" rtl="ltr"/>
 
-        <scroll id="drop-right" color="0 0 0 .6" min-width="10" mouse-capture="true"/>
+        <scroll id="drop-right" color="0 0 0 .6" min-width="10" mouse-capture="true" rtl="ltr"/>
 
         <!-- timeline -->
         <!--
diff --git a/src/app.cpp b/src/app.cpp
index c8e6943..97873d6 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -679,6 +679,9 @@ void App::terminate()
 {
     LOG("App::terminate");
     NodeStrokePreview::terminate_renderer();
+    rec_stop();
+    
+    async_start();
     TextureManager::invalidate();
     ShaderManager::invalidate();
     layout.unload();
@@ -693,7 +696,7 @@ void App::terminate()
     floating_color.reset();
     floating_layers.reset();
     floating_picker.reset();
-    rec_stop();
+    async_end();
 }
 
 void App::update_memory_usage(size_t bytes)
@@ -787,7 +790,9 @@ void App::rec_stop()
         rec_cv.notify_all();
         if (rec_thread.joinable())
             rec_thread.join();
+        async_start();
         update_rec_frames();
+        async_end();
     }
 }
 
diff --git a/src/app_layout.cpp b/src/app_layout.cpp
index 90adf32..398c51a 100644
--- a/src/app_layout.cpp
+++ b/src/app_layout.cpp
@@ -921,7 +921,7 @@ void App::init_menu_experimental()
                 };
                 rtl_btn->find<NodeCheckBox>("experimental-rtl-check")->on_value_changed = [this, main](Node*, bool checked) 
                 {
-                    auto ui = main->find("ui-root");
+                    auto ui = main->find("central-row");
                     ui->SetRTL(checked ? YGDirectionRTL : YGDirectionLTR);
                 };
             }