merge with Dev

2017-09-18 16:28:28 +02:00
parent 99353cae14 33867a4bf2
commit 1b78046318
23 changed files with 235 additions and 125 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -641,7 +641,7 @@ int main (int argc, char **argv)
            printf ("Error: -gimp requires two arguments\n");
            return 1;
        }
-    } else if (!remote && Glib::file_test (argv1, Glib::FILE_TEST_EXISTS)) {
+    } else if (!remote && Glib::file_test(argv1, Glib::FILE_TEST_EXISTS) && !Glib::file_test(argv1, Glib::FILE_TEST_IS_DIR)) {
        simpleEditor = true;
    }