aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-11-30 14:08:02 +0100
committerAqua-sama <aqua@iserlohn-fortress.net>2018-11-30 14:08:02 +0100
commitfbdaade51ceaea14998c611acf2a09d3198be640 (patch)
tree0b578c1eb01f259c482dca806bea4dc24dccc480 /src/main.cpp
parentAdd --session and --pick-session (diff)
downloadsmolbote-fbdaade51ceaea14998c611acf2a09d3198be640.tar.xz
pick-session: pass session data to existing instance if any
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp14
1 files changed, 9 insertions, 5 deletions
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();