From f0a7c1760a0186ebfb7d80da34d6675b6d987303 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Wed, 28 Nov 2018 16:31:48 +0100 Subject: Remove old session code --- src/main.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index a80784b..34f8a1a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -223,13 +223,15 @@ int main(int argc, char **argv) } } } + if(urls.isEmpty()) + urls.append(QString()); // if app is primary, create new sessions from received messages if(app.isPrimary() && !isStandalone) { - QObject::connect(&app, &Browser::receivedMessage, &app, [&app](quint32 instanceId, QByteArray message) { + QObject::connect(&app, &Browser::receivedMessage, &app, [](quint32 instanceId, QByteArray message) { Q_UNUSED(instanceId); auto doc = QJsonDocument::fromJson(message); - app.createSession(doc.object()); + Session::restoreSession(doc.object()); }); } @@ -242,11 +244,11 @@ int main(int argc, char **argv) sessionJson.close(); } } else { - sessionData = Session::window(profile.value(), urls); + sessionData = Session::fromCommandLine(profile.value(), urls); } if(app.isPrimary() || isStandalone) { - app.createSession(sessionData); + Session::restoreSession(sessionData); } else { // app is secondary and not standalone return app.sendMessage(QJsonDocument(sessionData).toJson()); -- cgit v1.2.1