Merge with 6e384f1d399717d5c68fca35de1f00394a6f1d58

2014-03-05 21:04:53 +01:00
parent 9ab0d2b2f3
commit 518a318822
36 changed files with 1168 additions and 529 deletions
--- 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);