From 391b1b32856a5964e429fd95ab588a5e9e745801 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 27 Dec 2020 22:56:43 +0100 Subject: Fix #359 Actually store the login details under the selected profile --- src/main.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 58bdda34..a60c66c4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -196,17 +196,19 @@ main(int argc, char *argv[]) std::exit(1); } - UserSettings settings; - if (parser.isSet(configName)) - settings.setProfile(parser.value(configName)); + UserSettings::initialize(parser.value(configName)); + else + UserSettings::initialize(std::nullopt); + + auto settings = UserSettings::instance().toWeakRef(); QFont font; - QString userFontFamily = settings.font(); + QString userFontFamily = settings.lock()->font(); if (!userFontFamily.isEmpty()) { font.setFamily(userFontFamily); } - font.setPointSizeF(settings.fontSize()); + font.setPointSizeF(settings.lock()->fontSize()); app.setFont(font); @@ -226,7 +228,7 @@ main(int argc, char *argv[]) // Move the MainWindow to the center w.move(screenCenter(w.width(), w.height())); - if (!settings.startInTray() && !settings.tray()) + if (!settings.lock()->startInTray() && !settings.lock()->tray()) w.show(); QObject::connect(&app, &QApplication::aboutToQuit, &w, [&w]() { -- cgit 1.5.1