From 500bc64f7671cfa9dbcfe1c2d808ea67eb0c3a42 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Mon, 2 Jul 2018 12:54:32 +0200
Subject: Add --no-remote option

---
 src/main.cpp | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index e81c846..d7bcee0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
 
     // --build
     if(config->exists("build")) {
-        std::cout << SMOLBOTE_BRANCH << ":" << SMOLBOTE_COMMIT;
+        std::cout << SMOLBOTE_BUILD;
         return 0;
     }
 
@@ -92,17 +92,11 @@ int main(int argc, char **argv)
         return 0;
     }
 
+    // argc, argv, allowSecondary
     Browser app(argc, argv);
     // set this, otherwise the webview becomes black when using a stylesheet
     app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
 
-    if(app.isPrimary())
-        qDebug("app is primary");
-    else if(app.isSecondary())
-        qDebug("app is secondary");
-    else
-        qDebug("app is something?");
-
     // translator
     if(config->exists("browser.locale")) {
         auto *translator = new QTranslator(&app);
@@ -121,9 +115,8 @@ int main(int argc, char **argv)
     }
 
     // command line arguments
+    bool ignoreSecondary = config->exists("no-remote");
     auto arguments = config->value<std::vector<std::string>>("args");
-
-    auto socket = config->value<QString>("socket");
     auto session = config->value<QString>("browser.session");
     auto profile = config->value<QString>("profile.default");
 
@@ -145,14 +138,19 @@ int main(int argc, char **argv)
         }
     }
 
-    // set up socket
-    QObject::connect(&app, &Browser::receivedMessage, &app, [&app](quint32 instanceId, QByteArray message) {
-        auto doc = QJsonDocument::fromJson(message);
-        app.createSession(doc.object());
-    });
+    //
+    if(!ignoreSecondary) {
+        QObject::connect(&app, &Browser::receivedMessage, &app, [&app](quint32 instanceId, QByteArray message) {
+            auto doc = QJsonDocument::fromJson(message);
+            app.createSession(doc.object());
+        });
+    }
 
     if(app.isPrimary()) {
         app.createSession(Session::toJsonObject(profile.value(), urls));
+    } else if(ignoreSecondary) {
+        // app is not primary (= secondary), and --ignore-secondary is set
+        return -1;
     } else if(session) {
         QFile sessionJson(session.value());
         if(sessionJson.open(QIODevice::ReadOnly | QIODevice::Text)) {
-- 
cgit v1.2.1