diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-14 13:14:52 +0200 |
---|---|---|
committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-14 13:15:24 +0200 |
commit | 1a778536deffaf013da7e918b52ab868d1f1a491 (patch) | |
tree | e06f8bb9ab3dc081e0aa16ce3b8d3fab3acf7608 | |
parent | 1855bffeb658c7ba64912ab4a35ba92dd19c7449 (diff) |
controllers/dlgprefcontroller: Call slotUpdate in slotCancel
-rw-r--r-- | src/controllers/dlgprefcontroller.cpp | 2 | ||||
-rw-r--r-- | src/controllers/dlgprefcontroller.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp index e281bbb501..4359f6f277 100644 --- a/src/controllers/dlgprefcontroller.cpp +++ b/src/controllers/dlgprefcontroller.cpp @@ -368,7 +368,7 @@ void DlgPrefController::slotUpdate() { } void DlgPrefController::slotCancel() { - slotShowPreset(m_pController->getPreset()); + slotUpdate(); } void DlgPrefController::applyPresetChanges() { diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h index 4577438331..b4ffed87ae 100644 --- a/src/controllers/dlgprefcontroller.h +++ b/src/controllers/dlgprefcontroller.h @@ -32,12 +32,12 @@ class DlgPrefController : public DlgPreferencePage { virtual ~DlgPrefController(); public slots: - // Called when we should apply / save our changes. + /// Called when the preference dialog (not this page) is shown to the user. + void slotUpdate(); + /// Called when the user clicks the global "Apply" button. void slotApply(); - // Called when we should cancel the changes made. + /// Called when the user clicks the global "Cancel" button. void slotCancel(); - // Called when preference dialog (not this dialog) is displayed. - void slotUpdate(); signals: void applyPreset(Controller* pController, ControllerPresetPointer pPreset, bool bEnabled); |