From 5bab7f4ca5d2709ebe18f206fe0145156db1b030 Mon Sep 17 00:00:00 2001
From: Oliver Duis <oduis@hotmail.com>
Date: Wed, 6 Apr 2011 19:51:26 +0200
Subject: [PATCH] Fixed crash when editing an image in thumb browser without
 saving; see issue #620

---
 rtgui/filebrowser.cc |  8 ++++++--
 rtgui/thumbnail.cc   | 25 ++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc
index 3ec02ce85..17f897e25 100644
--- a/rtgui/filebrowser.cc
+++ b/rtgui/filebrowser.cc
@@ -309,14 +309,18 @@ void FileBrowser::close () {
 		Glib::Mutex::Lock lock(entryMutex);
 		#endif
 
+        
+		selected.clear ();
+		notifySelectionListener ();
+
+        // The listener merges parameters with old values, so delete afterwards
     for (int i=0; i<fd.size(); i++)
     {
         delete fd[i];
     }
     fd.clear ();
-    selected.clear ();
 	}
-    notifySelectionListener ();
+
     lastClicked = NULL;
 }
 
diff --git a/rtgui/thumbnail.cc b/rtgui/thumbnail.cc
index ac2e0f586..86f5d922c 100644
--- a/rtgui/thumbnail.cc
+++ b/rtgui/thumbnail.cc
@@ -140,7 +140,10 @@ bool Thumbnail::isSupported () {
 }
 
 const ProcParams& Thumbnail::getProcParams () {
-	//Glib::Mutex::Lock lock(mutex);
+	// TODO: Check for Linux
+	#ifdef WIN32
+	Glib::Mutex::Lock lock(mutex);
+	#endif
 
     if (pparamsValid)
         return pparams;
@@ -161,7 +164,10 @@ const ProcParams& Thumbnail::getProcParams () {
 }
 
 void Thumbnail::loadProcParams () {
-	//Glib::Mutex::Lock lock(mutex);
+	// TODO: Check for Linux
+	#ifdef WIN32
+	Glib::Mutex::Lock lock(mutex);
+	#endif
 
     pparamsValid = false;
     if (options.paramsLoadLocation==PLL_Input) {
@@ -183,7 +189,10 @@ void Thumbnail::loadProcParams () {
 }
 
 void Thumbnail::clearProcParams (int whoClearedIt) {
-	//Glib::Mutex::Lock lock(mutex);
+	// TODO: Check for Linux
+	#ifdef WIN32
+	Glib::Mutex::Lock lock(mutex);
+	#endif
 
     cfs.recentlySaved = false;
     pparamsValid = false;
@@ -211,7 +220,10 @@ bool Thumbnail::hasProcParams () {
 }
 
 void Thumbnail::setProcParams (const ProcParams& pp, int whoChangedIt, bool updateCacheNow) {
-	//Glib::Mutex::Lock lock(mutex);
+	// TODO: Check for Linux
+	#ifdef WIN32
+	Glib::Mutex::Lock lock(mutex);
+	#endif
     
     if (pparams!=pp) 
         cfs.recentlySaved = false;
@@ -523,7 +535,10 @@ void Thumbnail::updateCache () {
 }
 
 Thumbnail::~Thumbnail () {
-	//Glib::Mutex::Lock lock(mutex);
+	// TODO: Check for Linux
+	#ifdef WIN32
+	Glib::Mutex::Lock lock(mutex);
+	#endif
 
     delete [] lastImg;
     delete tpp;