From 8e6cfcb76653f227452806e56b31466ff5f6384a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fl=C3=B6ssie?= <floessie.mail@gmail.com>
Date: Thu, 29 Sep 2016 18:21:37 +0200
Subject: [PATCH] Fix use-after-free of `ImageArea::mainCropWindow` (#3048)

---
 rtengine/median.h    | 2 +-
 rtgui/editorpanel.cc | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rtengine/median.h b/rtengine/median.h
index fa0e893f4..d7a6b37de 100644
--- a/rtengine/median.h
+++ b/rtengine/median.h
@@ -16,7 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
  *
- *  This median implementations from Floessie and Ingo Weyrich are inspired by this work:
+ *  These median implementations from Flössie and Ingo Weyrich are inspired by this work:
  *
  *  http://ndevilla.free.fr/median/median.pdf
  *  http://pages.ripco.net/~jgamble/nw.html
diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index 80dc3dfae..93a20c294 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -781,6 +781,7 @@ void EditorPanel::close ()
         if(iareapanel) {
             iareapanel->imageArea->setPreviewHandler (NULL);
             iareapanel->imageArea->setImProcCoordinator (NULL);
+            iareapanel->imageArea->unsubscribe();
         }
 
         rtengine::StagedImageProcessor::destroy (ipc);