X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Flogging.cpp;h=b747ab5452c5f4ee7b2aef633a65fc1e02986f47;hp=377011b68c928a40cf1cf14c590a220ea9ac6ece;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=1f2082e20445966624f6172ebefd53fb1a021164

diff --git a/pv/logging.cpp b/pv/logging.cpp
index 377011b..b747ab5 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
@@ -124,10 +126,10 @@ void Logging::log(const QString &text, int source)
 
 	switch (source) {
 	case LogSource_pv:
-		s = QString("pv: ") + text;  // black is default color
+		s = QString("<font color=\"darkMagenta\">pv: %1</font>").arg(text);
 		break;
 	case LogSource_sr:
-		s = QString("<font color=\"blue\">sr: %1</font>").arg(text);
+		s = QString("<font color=\"darkGreen\">sr: %1</font>").arg(text);
 		break;
 	case LogSource_srd:
 		s = QString("<font color=\"olive\">srd: %1</font>").arg(text);