X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Flogging.cpp;h=29d023c04ad577957aa3a1dbacc52fa0a47acb01;hp=377011b68c928a40cf1cf14c590a220ea9ac6ece;hb=e431acda693abc3d0cd339f95a95220c02ae13bd;hpb=67fb15bfd6f26e45cfd4486d473fda688ae8b2de

diff --git a/pv/logging.cpp b/pv/logging.cpp
index 377011b..29d023c 100644
--- a/pv/logging.cpp
+++ b/pv/logging.cpp
@@ -52,11 +52,13 @@ static void *prev_srd_log_cb_data;
 Logging::~Logging()
 {
 	qInstallMessageHandler(nullptr);
-	sr_log_callback_set(prev_sr_log_cb, prev_sr_log_cb_data);
+	if (prev_sr_log_cb)
+		sr_log_callback_set(prev_sr_log_cb, prev_sr_log_cb_data);
 	prev_sr_log_cb = nullptr;
 	prev_sr_log_cb_data = nullptr;
 #ifdef ENABLE_DECODE
-	srd_log_callback_set(prev_srd_log_cb, prev_srd_log_cb_data);
+	if (prev_srd_log_cb)
+		srd_log_callback_set(prev_srd_log_cb, prev_srd_log_cb_data);
 	prev_srd_log_cb = nullptr;
 	prev_srd_log_cb_data = nullptr;
 #endif