From c21e99827759413421040fd16d626f9b503bd2a5 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 13 Dec 2017 21:44:22 +0100 Subject: Don't create GeneralSettingsObjectWrapper object Instead use the application-wide instance. Creating a local object defeats the whole purpose of these objects - nobody can receive signals in case the settings changed. No other cases of locally created SettingsObjectWrapper objects were found. Signed-off-by: Berthold Stoeger --- mobile-widgets/qmlmanager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 37254f7cf..1e56e444c 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -1104,9 +1104,9 @@ void QMLManager::openNoCloudRepo() if (git_create_local_repo(filename)) appendTextToLog(get_error_string()); set_filename(filename); - GeneralSettingsObjectWrapper s(this); - s.setDefaultFilename(filename); - s.setDefaultFileBehavior(LOCAL_DEFAULT_FILE); + auto s = SettingsObjectWrapper::instance()->general_settings; + s->setDefaultFilename(filename); + s->setDefaultFileBehavior(LOCAL_DEFAULT_FILE); } openLocalThenRemote(filename); @@ -1121,9 +1121,9 @@ void QMLManager::saveChangesLocal() if (git_create_local_repo(filename)) appendTextToLog(get_error_string()); set_filename(filename); - GeneralSettingsObjectWrapper s(this); - s.setDefaultFilename(filename); - s.setDefaultFileBehavior(LOCAL_DEFAULT_FILE); + auto s = SettingsObjectWrapper::instance()->general_settings; + s->setDefaultFilename(filename); + s->setDefaultFileBehavior(LOCAL_DEFAULT_FILE); } } else if (!loadFromCloud()) { // this seems silly, but you need a common ancestor in the repository in -- cgit v1.2.3-70-g09d2