liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround for issue 1794: "Cannot save image or PP3 from Image Editor" ; properly catching exceptions on Windows should be preferred ; this patch is a clean fix for Linux and MacOS

Browse Source
This commit is contained in:
natureh 510
2013-04-10 01:12:42 +02:00
parent d8a9e4fc5b
commit de5026188d
4 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
rtgui/profilepanel.cc
View File

@@ -138,9 +138,23 @@ void ProfilePanel::save_clicked (GdkEventButton* event) {
dialog.set_current_name (lastFilename);
//Add the user's default (or global if multiuser=false) profile path to the Shortcut list
dialog.add_shortcut_folder(options.getPreferredProfilePath());
#ifdef WIN32
// Dirty workaround, waiting for a clean solution by using exceptions!
if (!safe_is_root_dir(options.getPreferredProfilePath()))
#endif
try {
dialog.add_shortcut_folder(options.getPreferredProfilePath());
}
catch (Gtk::FileChooserError &err) {}
//Add the image's path to the Shortcut list
dialog.add_shortcut_folder(imagePath);
#ifdef WIN32
// Dirty workaround, waiting for a clean solution by using exceptions!
if (!safe_is_root_dir(imagePath))
#endif
try {
dialog.add_shortcut_folder(imagePath);
}
catch (Gtk::FileChooserError &err) {}
//Add response buttons the the dialog:
dialog.add_button(Gtk::StockID("gtk-cancel"), Gtk::RESPONSE_CANCEL);
@@ -272,9 +286,24 @@ void ProfilePanel::load_clicked (GdkEventButton* event) {
FileChooserLastFolderPersister persister( &dialog, options.loadSaveProfilePath );
//Add the user's default (or global if multiuser=false) profile path to the Shortcut list
dialog.add_shortcut_folder(options.getPreferredProfilePath());
#ifdef WIN32
// Dirty workaround, waiting for a clean solution by using exceptions!
if (!safe_is_root_dir(options.getPreferredProfilePath()))
#endif
try {
dialog.add_shortcut_folder(options.getPreferredProfilePath());
}
catch (Gtk::FileChooserError &err) {}
//Add the image's path to the Shortcut list
dialog.add_shortcut_folder(imagePath);
#ifdef WIN32
// Dirty workaround, waiting for a clean solution by using exceptions!
if (!safe_is_root_dir(imagePath))
#endif
try {
dialog.add_shortcut_folder(imagePath);
}
catch (Gtk::FileChooserError &err) {}
//Add response buttons the the dialog:
dialog.add_button(Gtk::StockID("gtk-cancel"), Gtk::RESPONSE_CANCEL);