merge with dev

2019-08-19 07:01:36 +02:00
parent 48a5d27601 6c91abc3e9
commit 526ec318ce
3 changed files with 29 additions and 9 deletions
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -1090,8 +1090,8 @@ void EditorPanel::close ()
        if (iareapanel) {
            iareapanel->imageArea->setPreviewHandler (nullptr);
            iareapanel->imageArea->setImProcCoordinator (nullptr);
-            iareapanel->imageArea->unsubscribe();
        }
+        tpc->editModeSwitchedOff();

        rtengine::StagedImageProcessor::destroy (ipc);
        ipc = nullptr;