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

Make options ignore empty custom editor command

Browse Source
This commit is contained in:
Lawrence Lee 2021-04-18 12:33:32 -07:00
parent 044451868a
commit e6b2c9e7b0
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rtgui/options.cc
View File

@ -875,7 +875,7 @@ void Options::readFromFile(Glib::ustring fname)
// GIMP == 1, Photoshop == 2, Custom == 3. // GIMP == 1, Photoshop == 2, Custom == 3.
editorToSendTo = keyFile.get_integer("External Editor", "EditorKind"); editorToSendTo = keyFile.get_integer("External Editor", "EditorKind");
#ifdef WIN32 #ifdef WIN32
Glib::ustring gimpDir = ""; Glib::ustring gimpDir = "";
if (keyFile.has_key("External Editor", "GimpDir")) { if (keyFile.has_key("External Editor", "GimpDir")) {
gimpDir = keyFile.get_string("External Editor", "GimpDir"); gimpDir = keyFile.get_string("External Editor", "GimpDir");
@ -903,7 +903,7 @@ void Options::readFromFile(Glib::ustring fname)
if (keyFile.has_key("External Editor", "PhotoshopDir")) { if (keyFile.has_key("External Editor", "PhotoshopDir")) {
psDir = keyFile.get_string("External Editor", "PhotoshopDir"); psDir = keyFile.get_string("External Editor", "PhotoshopDir");
} }
auto executable = Glib::build_filename(psDir, "Photoshop.exe"); executable = Glib::build_filename(psDir, "Photoshop.exe");
if (Glib::file_test(executable, Glib::FILE_TEST_IS_EXECUTABLE)) { if (Glib::file_test(executable, Glib::FILE_TEST_IS_EXECUTABLE)) {
if (editorToSendTo == 2) { if (editorToSendTo == 2) {
externalEditorIndex = externalEditors.size(); externalEditorIndex = externalEditors.size();
@ -913,12 +913,14 @@ void Options::readFromFile(Glib::ustring fname)
if (keyFile.has_key("External Editor", "CustomEditor")) { if (keyFile.has_key("External Editor", "CustomEditor")) {
executable = keyFile.get_string("External Editor", "CustomEditor"); executable = keyFile.get_string("External Editor", "CustomEditor");
if (!executable.empty()) {
if (editorToSendTo == 3) { if (editorToSendTo == 3) {
externalEditorIndex = externalEditors.size(); externalEditorIndex = externalEditors.size();
} }
externalEditors.push_back(ExternalEditor("-", executable, "")); externalEditors.push_back(ExternalEditor("-", executable, ""));
} }
#elif defined __APPLE__ }
#elif defined __APPLE__
if (editorToSendTo == 1) { if (editorToSendTo == 1) {
externalEditorIndex = externalEditors.size(); externalEditorIndex = externalEditors.size();
} }
@ -932,12 +934,14 @@ void Options::readFromFile(Glib::ustring fname)
if (keyFile.has_key("External Editor", "CustomEditor")) { if (keyFile.has_key("External Editor", "CustomEditor")) {
auto executable = keyFile.get_string("External Editor", "CustomEditor"); auto executable = keyFile.get_string("External Editor", "CustomEditor");
if (!executable.empty()) {
if (editorToSendTo == 3) { if (editorToSendTo == 3) {
externalEditorIndex = externalEditors.size(); externalEditorIndex = externalEditors.size();
} }
externalEditors.push_back(ExternalEditor("-", executable, "")); externalEditors.push_back(ExternalEditor("-", executable, ""));
} }
#else }
#else
if (Glib::find_program_in_path("gimp").compare("")) { if (Glib::find_program_in_path("gimp").compare("")) {
if (editorToSendTo == 1) { if (editorToSendTo == 1) {
externalEditorIndex = externalEditors.size(); externalEditorIndex = externalEditors.size();
@ -952,12 +956,14 @@ void Options::readFromFile(Glib::ustring fname)
if (keyFile.has_key("External Editor", "CustomEditor")) { if (keyFile.has_key("External Editor", "CustomEditor")) {
auto executable = keyFile.get_string("External Editor", "CustomEditor"); auto executable = keyFile.get_string("External Editor", "CustomEditor");
if (!executable.empty()) {
if (editorToSendTo == 3) { if (editorToSendTo == 3) {
externalEditorIndex = externalEditors.size(); externalEditorIndex = externalEditors.size();
} }
externalEditors.push_back(ExternalEditor("-", executable, "")); externalEditors.push_back(ExternalEditor("-", executable, ""));
} }
#endif }
#endif
} }
} }