Merge branch 'master' into lockable-color-picker

2016-09-30 01:06:19 +02:00
parent f904bc8f84 bf27304311
commit 4506247985
57 changed files with 976 additions and 761 deletions
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -782,6 +782,7 @@ void EditorPanel::close ()
        if(iareapanel) {
            iareapanel->imageArea->setPreviewHandler (NULL);
            iareapanel->imageArea->setImProcCoordinator (NULL);
+            iareapanel->imageArea->unsubscribe();
        }

        rtengine::StagedImageProcessor::destroy (ipc);