Merge with 6e384f1d399717d5c68fca35de1f00394a6f1d58

This commit is contained in:
Hombrenatureh.510
2014-03-05 21:04:53 +01:00
parent 9ab0d2b2f3
commit 518a318822
36 changed files with 1168 additions and 529 deletions

View File

@@ -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);
}