Show the settings also when no arguments are passed

sendMessage would only be called if there were options to
be sent to the running application.
Fix the issue by having explicitly named messages and always
send the show settings message.

Issue #2374

1 files changed, 6 insertions, 4 deletions

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 6cb1b50a6..6975a79e0 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -96,14 +96,16 @@ int main(int argc, char **argv)
     }
 
     // if the application is already running, notify it.
-    if( app.isRunning() ) {
+    if(app.isRunning()) {
         qDebug() << Q_FUNC_INFO << "Already running, exiting...";
         QStringList args = app.arguments();
-        if ( args.size() > 1 && ! app.giveHelp() ) {
-            QString msg = args.join( QLatin1String("|") );
-            if( ! app.sendMessage( msg ) )
+        if (args.size() > 1) {
+            QString msg = args.join(QLatin1String("|"));
+            if(!app.sendMessage(QLatin1String("MSG_PARSEOPTIONS:") + msg))
                 return -1;
         }
+        if(!app.sendMessage(QLatin1String("MSG_SHOWSETTINGS")))
+            return -1;
         return 0;
     } else {
         if (!QSystemTrayIcon::isSystemTrayAvailable()) {