sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix -resetguisettings (#3624)

Browse Source
This commit is contained in:
UdjinM6 2020-07-27 10:33:00 +03:00 committed by GitHub
parent 7e10b8236d
commit 74a66f5bd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/dash.cpp
View File

@ -357,7 +357,7 @@ BitcoinApplication::~BitcoinApplication()
#endif
// Delete Qt-settings if user clicked on "Reset Options"
QSettings settings;
if(optionsModel && optionsModel->resetSettings){
if(optionsModel && optionsModel->resetSettingsOnShutdown){
settings.clear();
settings.sync();
}

1
src/qt/optionsdialog.cpp
View File

@ -284,6 +284,7 @@ void OptionsDialog::on_resetButton_clicked()
/* reset all options and close GUI */
model->Reset();
model->resetSettingsOnShutdown = true;
QApplication::quit();
}
}

3
src/qt/optionsmodel.cpp
View File

@ -52,8 +52,6 @@ void OptionsModel::Init(bool resetSettings)
checkAndMigrate();
this->resetSettings = resetSettings;
QSettings settings;
// Ensure restart flag is unset on client startup
@ -245,7 +243,6 @@ void OptionsModel::Reset()
// Remove all entries from our QSettings object
settings.clear();
resetSettings = true; // Needed in dash.cpp during shotdown to also remove the window positions
// default setting for OptionsModel::StartAtStartup - disabled
if (GUIUtil::GetStartOnSystemStartup())

2
src/qt/optionsmodel.h
View File

@ -88,7 +88,7 @@ public:
/* Restart flag helper */
void setRestartRequired(bool fRequired);
bool isRestartRequired() const;
bool resetSettings;
bool resetSettingsOnShutdown{false};
private:
/* Qt-only settings */