From 7232aa2c6e0001a39d7d5606aff3f3e67f643527 Mon Sep 17 00:00:00 2001
From: Ingo <heckflosse@i-weyrich.de>
Date: Thu, 27 Feb 2014 16:02:49 +0100
Subject: [PATCH] FileChooser-using tools applied unintentionally (SETM), Issue
 2259

---
 rtgui/darkframe.cc   | 10 ++++++++--
 rtgui/flatfield.cc   | 12 +++++++++---
 rtgui/icmpanel.cc    |  3 +++
 rtgui/lensprofile.cc |  9 +++++++--
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/rtgui/darkframe.cc b/rtgui/darkframe.cc
index dfea06da1..c8a6655ed 100644
--- a/rtgui/darkframe.cc
+++ b/rtgui/darkframe.cc
@@ -62,6 +62,8 @@ void DarkFrame::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
 	}
 	if (safe_file_test (pp->raw.dark_frame, Glib::FILE_TEST_EXISTS))
 		darkFrameFile->set_filename (pp->raw.dark_frame);
+	else
+		darkFrameReset();
 	hbdf->set_sensitive( !pp->raw.df_autoselect );
 
 	lastDFauto = pp->raw.df_autoselect;
@@ -137,8 +139,12 @@ void DarkFrame::darkFrameChanged()
 void DarkFrame::darkFrameReset()
 {
 	dfChanged=true;
-	//darkFrameFile->set_current_name("");
-	darkFrameFile->set_filename ("");
+
+// caution: I had to make this hack, because set_current_folder() doesn't work correctly!
+//          Because szeva doesn't exist since he was committed to happy hunting ground in Issue 316
+//          we can use him now for this hack
+	darkFrameFile->set_filename (options.lastDarkframeDir + "/szeva");
+// end of the hack
 
 	if (!options.lastDarkframeDir.empty())
 		darkFrameFile->set_current_folder(options.lastDarkframeDir);
diff --git a/rtgui/flatfield.cc b/rtgui/flatfield.cc
index a3723c0e1..6e63c9909 100755
--- a/rtgui/flatfield.cc
+++ b/rtgui/flatfield.cc
@@ -84,6 +84,8 @@ void FlatField::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
 	}
 	if (safe_file_test (pp->raw.ff_file, Glib::FILE_TEST_EXISTS))
 		flatFieldFile->set_filename (pp->raw.ff_file);
+	else
+		flatFieldFile_Reset();
 	hbff->set_sensitive( !pp->raw.ff_AutoSelect );
 
 	lastFFAutoSelect = pp->raw.ff_AutoSelect;
@@ -175,9 +177,13 @@ void FlatField::flatFieldFileChanged()
 void FlatField::flatFieldFile_Reset()
 {
 	ffChanged=true;
-	//flatFieldFile->set_current_name("");
-	flatFieldFile->set_filename ("");
-
+
+// caution: I had to make this hack, because set_current_folder() doesn't work correctly!
+//          Because szeva doesn't exist since he was committed to happy hunting ground in Issue 316
+//          we can use him now for this hack
+	flatFieldFile->set_filename (options.lastFlatfieldDir + "/szeva");
+// end of the hack
+
 	if (!options.lastFlatfieldDir.empty())
 		flatFieldFile->set_current_folder(options.lastFlatfieldDir);
 
diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc
index ae33732e9..3dc9a632a 100644
--- a/rtgui/icmpanel.cc
+++ b/rtgui/icmpanel.cc
@@ -356,6 +356,9 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited) {
     tcurveconn.block(true);
     blendcmsconn.block(true);
 
+	if(pp->icm.input.substr(0,5) != "file:")
+		ipDialog->set_filename("");
+	
     if (pp->icm.input == "(none)" && icamera->get_state()!=Gtk::STATE_INSENSITIVE) {
         inone->set_active (true);
         ckbBlendCMSMatrix->set_sensitive (false);
diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc
index 7b085278e..63ca85603 100644
--- a/rtgui/lensprofile.cc
+++ b/rtgui/lensprofile.cc
@@ -84,9 +84,14 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
         fcbLCPFile->set_filename (pp->lensProf.lcpFile);
         updateDisabled(true);
     } else {
-        Glib::ustring fname = fcbLCPFile->get_filename();
+        Glib::ustring fname = fcbLCPFile->get_filename();
         if (!pp->lensProf.lcpFile.empty())
-            fcbLCPFile->unselect_filename(fname);
+            fcbLCPFile->unselect_filename(fname);
+		else {
+			Glib::ustring lastFolder = fcbLCPFile->get_current_folder();
+			fcbLCPFile->set_filename("");
+			fcbLCPFile->set_current_folder(lastFolder);	
+		}
         updateDisabled(false);
     }