summary refs log tree commit diff
path: root/src/UserSettingsPage.cpp
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2021-02-05 22:44:31 +0100
committerGitHub <noreply@github.com>2021-02-05 22:44:31 +0100
commit49ce7701d32ac1dc21581691c4d658e8c8768ec4 (patch)
treee65493c0f96624e4f9d478fba335b73589a791db /src/UserSettingsPage.cpp
parentFix scheme handler not passing arguments (diff)
parentDon't attempt to begin group "" (diff)
downloadnheko-49ce7701d32ac1dc21581691c4d658e8c8768ec4.tar.xz
Merge pull request #455 from LorenDB/fixLogoutIssues
Fix issues with logout
Diffstat (limited to 'src/UserSettingsPage.cpp')
-rw-r--r--src/UserSettingsPage.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp

index 96c07d7c..d31c8ef9 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp
@@ -115,8 +115,8 @@ UserSettings::load(std::optional<QString> profile) cameraFrameRate_ = settings.value("user/camera_frame_rate", QString()).toString(); useStunServer_ = settings.value("user/use_stun_server", false).toBool(); - if (profile) - profile_ = *profile; + if (profile) // set to "" if it's the default to maintain compatibility + profile_ = (*profile == "default") ? "" : *profile; else profile_ = settings.value("user/currentProfile", "").toString();