merge with dev

2018-12-30 13:57:40 +01:00
parent d54198cc56 b968f956da
commit cc6cf81c57
11 changed files with 126 additions and 28 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -537,7 +537,7 @@ int main (int argc, char **argv)
                bool Console = true;

                for (int i = 1; i < argc; i++)
-                    if (!strcmp (argv[i], "-w") || !strcmp (argv[i], "-R")) {
+                    if (!strcmp (argv[i], "-w") || !strcmp (argv[i], "-R") || !strcmp (argv[i], "-gimp")) {
                        Console = false;
                        break;
                    }