From 2e6afb8e8900739080e9df206546913d5da06a12 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 6 Oct 2015 08:53:54 +0100 Subject: 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 --- qt-ui/preferences.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'qt-ui/preferences.cpp') 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 -- cgit v1.2.3-70-g09d2