aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-11-28 16:31:48 +0100
committerAqua-sama <aqua@iserlohn-fortress.net>2018-11-28 16:31:48 +0100
commitf0a7c1760a0186ebfb7d80da34d6675b6d987303 (patch)
tree5a20e7618f093c13cbc7ba844d37fe4066a5ba48 /src/main.cpp
parentRewrite Session saving and loading (diff)
downloadsmolbote-f0a7c1760a0186ebfb7d80da34d6675b6d987303.tar.xz
Remove old session code
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp10
1 files changed, 6 insertions, 4 deletions
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());