Merge branch 'dev' into hidpi-icons

2018-12-13 00:52:07 +01:00
parent 81407cd663 d47a54fb3d
commit 8728142b64
57 changed files with 1929 additions and 1418 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -588,7 +588,7 @@ int main (int argc, char **argv)
                bool Console = true;

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