projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecoderSelector: Use srd_decoder_get_by_id()
[pulseview.git]
/
pv
/
logging.cpp
diff --git
a/pv/logging.cpp
b/pv/logging.cpp
index 377011b68c928a40cf1cf14c590a220ea9ac6ece..b747ab5452c5f4ee7b2aef633a65fc1e02986f47 100644
(file)
--- a/
pv/logging.cpp
+++ b/
pv/logging.cpp
@@
-52,11
+52,13
@@
static void *prev_srd_log_cb_data;
Logging::~Logging()
{
qInstallMessageHandler(nullptr);
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
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
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:
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:
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);
break;
case LogSource_srd:
s = QString("<font color=\"olive\">srd: %1</font>").arg(text);