summaryrefslogtreecommitdiffstats
path: root/gui/dialogs/SettingsDialog.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-03-19 22:28:04 +0100
committerPetr Mrázek <peterix@gmail.com>2014-03-19 22:28:04 +0100
commit1705832febb86181e52222fdbfe87d8d2d0ba5b7 (patch)
tree6b289c02868a7d5a88703eee0042c419a8afeca4 /gui/dialogs/SettingsDialog.cpp
parent4623c1b34f35dd896a9ccacd9b982bca9dc0b880 (diff)
parent55e4cb6fb5ea59958ac0bc386b9df06476c1ddb4 (diff)
downloadMultiMC-1705832febb86181e52222fdbfe87d8d2d0ba5b7.tar
MultiMC-1705832febb86181e52222fdbfe87d8d2d0ba5b7.tar.gz
MultiMC-1705832febb86181e52222fdbfe87d8d2d0ba5b7.tar.lz
MultiMC-1705832febb86181e52222fdbfe87d8d2d0ba5b7.tar.xz
MultiMC-1705832febb86181e52222fdbfe87d8d2d0ba5b7.zip
Merge remote-tracking branch 'origin/feature_notif_65449324' into develop
Diffstat (limited to 'gui/dialogs/SettingsDialog.cpp')
-rw-r--r--gui/dialogs/SettingsDialog.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp
index d79bb558..7ec48336 100644
--- a/gui/dialogs/SettingsDialog.cpp
+++ b/gui/dialogs/SettingsDialog.cpp
@@ -308,6 +308,11 @@ void SettingsDialog::applySettings(SettingsObject *s)
s->set("Language",
ui->languageBox->itemData(ui->languageBox->currentIndex()).toLocale().bcp47Name());
+ if (ui->resetNotificationsBtn->isChecked())
+ {
+ s->set("ShownNotifications", QString());
+ }
+
// Updates
s->set("AutoUpdate", ui->autoUpdateCheckBox->isChecked());
s->set("UpdateChannel", m_currentUpdateChannel);