summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2019-12-02 11:07:42 +0100
committerDominik Holland <dominik.holland@qt.io>2019-12-02 11:07:42 +0100
commitc284759db333996aa8c40c8148b76956c14fa5c4 (patch)
tree766c6317145b16a500563575b60c6d009f71edbd
parent69291b222ba44228528f015e11eb08e10df44cbf (diff)
parentab481603236b658bbb7e71231deec40554a9684a (diff)
downloadqtivi-c284759db333996aa8c40c8148b76956c14fa5c4.tar.gz
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I576fbcc52a2f7eb50c6303d2296f9daba16618fb
-rw-r--r--src/geniviextras/qdltregistration.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/geniviextras/qdltregistration.cpp b/src/geniviextras/qdltregistration.cpp
index 47abe21..d8dccdc 100644
--- a/src/geniviextras/qdltregistration.cpp
+++ b/src/geniviextras/qdltregistration.cpp
@@ -55,6 +55,9 @@ QT_BEGIN_NAMESPACE
void qtGeniviLogLevelChangedHandler(char context_id[], uint8_t log_level, uint8_t trace_status)
{
+ if (!globalDltRegistration())
+ return;
+
auto d = globalDltRegistration()->d_ptr;
d->m_mutex.lock();
const QLoggingCategory *category = d->dltLogLevelChanged(context_id, log_level, trace_status);