summaryrefslogtreecommitdiffstats
path: root/qt-ui
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-10-06 08:53:54 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-10-06 08:53:54 +0100
commit2e6afb8e8900739080e9df206546913d5da06a12 (patch)
tree69c1740128595d4eee04fe1dbf088d9433283aed /qt-ui
parente5fa424a67b351a7c08ab4c9b2396b612635bef4 (diff)
downloadsubsurface-2e6afb8e8900739080e9df206546913d5da06a12.tar.gz
Correctly handle the webservice userid in preferences
Because of the way that the webservice userid can be saved both in the preferences and in a data file it was treated differently than other preferences settings - which prevented the reset of the preferences from actually clearing it. This patch makes sure that if the preferences are reset the preferences UI reflects that. To make this work the data file loading functions can no longer be allowed to just simply clear out the userid preference value just in case they might load a new one. Fixes #939 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
-rw-r--r--qt-ui/preferences.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp
index 615f0b84e..32f05c4ab 100644
--- a/qt-ui/preferences.cpp
+++ b/qt-ui/preferences.cpp
@@ -239,6 +239,7 @@ void PreferencesDialog::setUiFromPrefs()
ui.save_password_local->setChecked(prefs.save_password_local);
cloudPinNeeded();
ui.cloud_background_sync->setChecked(prefs.cloud_background_sync);
+ ui.default_uid->setText(prefs.userid);
// GeoManagement
#ifdef DISABLED