X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Flogging.cpp;h=29d023c04ad577957aa3a1dbacc52fa0a47acb01;hb=4521022bf4ea07aff38bfa09fe0f7d5702b26475;hp=377011b68c928a40cf1cf14c590a220ea9ac6ece;hpb=1f2082e20445966624f6172ebefd53fb1a021164;p=pulseview.git diff --git a/pv/logging.cpp b/pv/logging.cpp index 377011b6..29d023c0 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