X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=eb9e88b6755ddc2813d08d66f3fd208be7f6cd21;hb=13e475e412663ee904b94a6510b5628bdb8b84fa;hp=8cb8d67de31ad58958464bb1f27e72afa665cddd;hpb=bf9f12687c8d43422455cbdc27ec1cc5d4305149;p=pulseview.git

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index 8cb8d67..eb9e88b 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -31,7 +31,7 @@ namespace pv {
 namespace dialogs {
 
 Settings::Settings(QWidget *parent) :
-	QDialog(parent, 0)
+	QDialog(parent, nullptr)
 {
 	QTabWidget *tab_stack = new QTabWidget(this);
 	tab_stack->addTab(get_view_settings_form(tab_stack), tr("&Views"));
@@ -45,6 +45,10 @@ Settings::Settings(QWidget *parent) :
 
 	connect(button_box, SIGNAL(accepted()), this, SLOT(accept()));
 	connect(button_box, SIGNAL(rejected()), this, SLOT(reject()));
+
+	// Start to record changes
+	GlobalSettings settings;
+	settings.start_tracking();
 }
 
 QWidget *Settings::get_view_settings_form(QWidget *parent) const
@@ -76,11 +80,17 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 
 void Settings::accept()
 {
+	GlobalSettings settings;
+	settings.stop_tracking();
+
 	QDialog::accept();
 }
 
 void Settings::reject()
 {
+	GlobalSettings settings;
+	settings.undo_tracked_changes();
+
 	QDialog::reject();
 }