From fbdaade51ceaea14998c611acf2a09d3198be640 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Fri, 30 Nov 2018 14:08:02 +0100
Subject: pick-session: pass session data to existing instance if any

---
 src/main.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 7cc8757..bb58782 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -237,12 +237,16 @@ int main(int argc, char **argv)
         });
     }
 
-    if(pickSession) {
-        auto *dlg = new SessionDialog();
-        dlg->exec();
-    } else {
+    {
         QJsonObject sessionData;
-        if(session) {
+
+        if(pickSession) {
+            auto *dlg = new SessionDialog();
+            if(const auto pick = dlg->pickSession())
+                sessionData = pick.value();
+            else
+                sessionData = Session::fromCommandLine(profile.value(), urls);
+        } else if(session) {
             QFile sessionJson(session.value());
             if(sessionJson.open(QIODevice::ReadOnly | QIODevice::Text)) {
                 sessionData = QJsonDocument::fromJson(sessionJson.readAll()).object();
-- 
cgit v1.2.1