From 99c4952654ae218a6b45ca61066deb4f81f68416 Mon Sep 17 00:00:00 2001
From: Soeren Apel <soeren@apelpie.net>
Date: Thu, 14 Jun 2018 21:05:07 +0200
Subject: [PATCH] Fix up change handler registration

Before, the mismatched registration/deregistration lead to
crashes. Example:

Load file, load another file into the same session,
change any setting -> crash because first change notifier is
called but invalid
---
 pv/views/trace/analogsignal.cpp | 5 -----
 pv/views/trace/analogsignal.hpp | 2 --
 pv/views/trace/trace.cpp        | 5 +++++
 pv/views/trace/trace.hpp        | 1 +
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index 14870285..67459c8a 100644
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -129,11 +129,6 @@ AnalogSignal::AnalogSignal(
 	update_scale();
 }
 
-AnalogSignal::~AnalogSignal()
-{
-	GlobalSettings::remove_change_handler(this);
-}
-
 shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
 	return base_->analog_data();
diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 928407bc..19334ee2 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -74,8 +74,6 @@ private:
 public:
 	AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
 
-	~AnalogSignal();
-
 	shared_ptr<pv::data::SignalData> data() const;
 
 	virtual void save_settings(QSettings &settings) const;
diff --git a/pv/views/trace/trace.cpp b/pv/views/trace/trace.cpp
index 5977bc2c..7d850112 100644
--- a/pv/views/trace/trace.cpp
+++ b/pv/views/trace/trace.cpp
@@ -68,6 +68,11 @@ Trace::Trace(shared_ptr<data::SignalBase> channel) :
 		settings.value(GlobalSettings::Key_View_ShowHoverMarker).toBool();
 }
 
+Trace::~Trace()
+{
+	GlobalSettings::remove_change_handler(this);
+}
+
 shared_ptr<data::SignalBase> Trace::base() const
 {
 	return base_;
diff --git a/pv/views/trace/trace.hpp b/pv/views/trace/trace.hpp
index 758b2e97..d6d53045 100644
--- a/pv/views/trace/trace.hpp
+++ b/pv/views/trace/trace.hpp
@@ -94,6 +94,7 @@ private:
 
 protected:
 	Trace(shared_ptr<data::SignalBase> channel);
+	~Trace();
 
 public:
 	/**
-- 
2.30.2