Prevent the settings dialogs from crashing when OK is pressed without changes made.

diff --git a/src/qtui/settingsdlg.cpp b/src/qtui/settingsdlg.cpp
index b02e711..b5fc125 100644 (file)
--- a/src/qtui/settingsdlg.cpp
+++ b/src/qtui/settingsdlg.cpp
@@ -121,7 +121,9 @@ void SettingsDlg::setButtonStates() {
 void SettingsDlg::buttonClicked(QAbstractButton *button) {
   switch(ui.buttonBox->standardButton(button)) {
     case QDialogButtonBox::Ok:
 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();
       break;
     case QDialogButtonBox::Apply:
       applyChanges();

diff --git a/src/qtui/settingspagedlg.cpp b/src/qtui/settingspagedlg.cpp
index df37ba0..2c817a9 100644 (file)
--- a/src/qtui/settingspagedlg.cpp
+++ b/src/qtui/settingspagedlg.cpp
@@ -52,7 +52,9 @@ void SettingsPageDlg::setButtonStates() {
 void SettingsPageDlg::buttonClicked(QAbstractButton *button) {
   switch(ui.buttonBox->standardButton(button)) {
     case QDialogButtonBox::Ok:
 void SettingsPageDlg::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();
       break;
     case QDialogButtonBox::Apply:
       applyChanges();