Prevent segfault when invalid theme in options file, fixes #2991

2015-12-09 14:04:02 +01:00
parent 031c41af60
commit 26e094d56e
1 changed files with 6 additions and 0 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -278,6 +278,12 @@ int main(int argc, char **argv)

    if (options.theme.empty()) {
        options.theme = "21-Gray-Gray";
+    } else {
+        std::string themeFile = argv0 + "/themes/" + options.theme + ".gtkrc";
+        if (!std::ifstream(themeFile)) {
+            printf ("Current theme in options file is invalid:  %s\nChanging to 21-Gray-Gray\n", options.theme.c_str());
+            options.theme = "21-Gray-Gray";
+        }
    }

    if (!options.useSystemTheme) {