Merge pull request #736 from Thulinma/smallFixes

Fixes for images and commandline options

1 files changed, 9 insertions, 6 deletions

diff --git a/src/main.cpp b/src/main.cpp

index cf7e29e6..f6373d2a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -176,12 +176,6 @@ main(int argc, char *argv[])
                           100,
                           userdata);
 
-    if (app.isSecondary()) {
-        // open uri in main instance
-        app.sendMessage(matrixUri.toUtf8());
-        return 0;
-    }
-
     QCommandLineParser parser;
     parser.addHelpOption();
     parser.addVersionOption();
@@ -202,6 +196,15 @@ main(int argc, char *argv[])
 
     parser.process(app);
 
+    // This check needs to happen _after_ process(), so that we actually print help for --help when
+    // Nheko is already running.
+    if (app.isSecondary()) {
+        nhlog::ui()->info("Sending Matrix URL to main application: {}", matrixUri.toStdString());
+        // open uri in main instance
+        app.sendMessage(matrixUri.toUtf8());
+        return 0;
+    }
+
     app.setWindowIcon(QIcon::fromTheme("nheko", QIcon{":/logos/nheko.png"}));
 
     http::init();