From f16761ac9568c39e59145a9b3bd9f172203dbd22 Mon Sep 17 00:00:00 2001
From: ffsup2 <ffsup2@localhost>
Date: Wed, 14 Jul 2010 22:11:07 +0200
Subject: [PATCH] Correct crash when closing editor Panel with hidden history
 Remeber last option about hidden/shown panel

---
 rtgui/editorpanel.cc   |  1 +
 rtgui/previewwindow.cc | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index a5d2bee82..61f21a026 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -466,6 +466,7 @@ void EditorPanel::hideHistoryActivated () {
     removeIfThere (hpanedl, leftbox, false);
     if (hidehp->get_active()) 
         hpanedl->pack1 (*leftbox, false, true);
+    options.showHistory = hidehp->get_active();
 }
 
 bool EditorPanel::handleShortcutKey (GdkEventKey* event) {
diff --git a/rtgui/previewwindow.cc b/rtgui/previewwindow.cc
index 3881d1e9c..d94df5b87 100644
--- a/rtgui/previewwindow.cc
+++ b/rtgui/previewwindow.cc
@@ -20,17 +20,18 @@
 #include <guiutils.h>
 #include <imagearea.h>
 
-PreviewWindow::PreviewWindow () : previewHandler(NULL), mainCropWin(NULL), isMoving(false) {
+PreviewWindow::PreviewWindow () : previewHandler(NULL), mainCropWin(NULL), isMoving(false),cCropMoving(NULL),cNormal(NULL) {
 
     rconn = signal_size_allocate().connect( sigc::mem_fun(*this, &PreviewWindow::on_resized) );
 }
 
 PreviewWindow::~PreviewWindow () {
 
-    delete cCropMoving;
-#ifndef WIN32
-    delete cNormal;
-#endif
+	if( cCropMoving )
+		delete cCropMoving;
+	if( cNormal )
+		delete cNormal;
+
 }
 
 void PreviewWindow::on_realize () {