thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #359

Browse source 
Actually store the login details under the selected profile
This commit is contained in:
Nicolas Werner 2020-12-27 22:56:43 +01:00
parent 71aea17ac6
commit 391b1b3285
5 changed files with 53 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main.cpp
View file

@ -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]() {