X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingsdlg.cpp;h=b5fc125c2e1e131f2e021140b0e5b0c37dd04056;hb=1f02b7201ab7b86238e705d2ce5b22f50bf6acfe;hp=eb0731934d00aba70532c98ecaf0d7abeaf7d5ba;hpb=f18d7db990cb23c87fa3586e19b2f8aa5509a66c;p=quassel.git

diff --git a/src/qtui/settingsdlg.cpp b/src/qtui/settingsdlg.cpp
index eb073193..b5fc125c 100644
--- a/src/qtui/settingsdlg.cpp
+++ b/src/qtui/settingsdlg.cpp
@@ -113,7 +113,6 @@ void SettingsDlg::itemSelected() {
 
 void SettingsDlg::setButtonStates() {
   SettingsPage *sp = currentPage();
-  ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(sp && sp->hasChanged());
   ui.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(sp && sp->hasChanged());
   ui.buttonBox->button(QDialogButtonBox::Reset)->setEnabled(sp && sp->hasChanged());
   ui.buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(sp && sp->hasDefaults());
@@ -122,7 +121,9 @@ void SettingsDlg::setButtonStates() {
 void SettingsDlg::buttonClicked(QAbstractButton *button) {
   switch(ui.buttonBox->standardButton(button)) {
     case QDialogButtonBox::Ok:
-      if(applyChanges()) accept();
+      if(currentPage() && currentPage()->hasChanged()) {
+        if(applyChanges()) accept();
+      } else accept();
       break;
     case QDialogButtonBox::Apply:
       applyChanges();
@@ -170,7 +171,7 @@ void SettingsDlg::loadDefaults() {
   if(!currentPage()) return;
   int ret = QMessageBox::question(this, tr("Restore Defaults"), tr("Do you like to restore the default values for this page?"),
                                   QMessageBox::RestoreDefaults|QMessageBox::Cancel, QMessageBox::Cancel);
-  if(ret == QMessageBox::Yes) {
+  if(ret == QMessageBox::RestoreDefaults) {
     currentPage()->defaults();
   }
 }