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

Merge pull request #3976 from Beep6581/verbose-options

Browse Source 
Always show console warning and popup when saving options file fails, #3975
This commit is contained in:
Beep6581
2017-07-19 19:10:19 +02:00
committed by GitHub
parent d67ca00ce2 ca9e28fea7
commit 92074de30f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/CMakeLists.txt
View File

@@ -229,7 +229,7 @@ if((WIN32) AND NOT(UPPER_CMAKE_BUILD_TYPE STREQUAL "DEBUG"))
set_target_properties(rth PROPERTIES LINK_FLAGS "-mwindows") set_target_properties(rth PROPERTIES LINK_FLAGS "-mwindows")
endif() endif()
set_target_properties(rth PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee) set_target_properties(rth PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee)
set_target_properties(rth-cli PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee-cli) set_target_properties(rth-cli PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -DRAWTHERAPEE_CLI" OUTPUT_NAME rawtherapee-cli)
# Add linked libraries dependencies to executables targets # Add linked libraries dependencies to executables targets
target_link_libraries(rth rtengine target_link_libraries(rth rtengine

11
rtgui/options.cc
View File

@@ -2229,10 +2229,13 @@ int Options::saveToFile (Glib::ustring fname)
FILE *f = g_fopen (fname.c_str (), "wt"); FILE *f = g_fopen (fname.c_str (), "wt");
if (f == nullptr) { if (f == nullptr) {
if (options.rtSettings.verbose) { std::cout << "Warning! Unable to save your preferences to: " << fname << std::endl;
printf ("Options::saveToFile / Error: unable to open file \"%s\" with write access!\n", fname.c_str()); #ifndef RAWTHERAPEE_CLI
} Glib::ustring msg_ = Glib::ustring::compose(M("MAIN_MSG_WRITEFAILED"), fname.c_str());
//writeFailed (getToplevelWindow (this), msg_);
Gtk::MessageDialog msgd (msg_, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_CLOSE, true);
msgd.run ();
#endif
return 1; return 1;
} else { } else {
fprintf (f, "%s", keyData.c_str ()); fprintf (f, "%s", keyData.c_str ());