summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/qml/qmlcppengine.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2014-05-05 17:09:04 +0300
committerhjk <hjk121@nokiamail.com>2014-05-05 16:59:57 +0200
commit60ccb2a425c2b55d15b8db75aa7b775e6752c02e (patch)
treed1022a6ec7038185109a57bdc7bb30299ac1ce74 /src/plugins/debugger/qml/qmlcppengine.cpp
parent753215e29710cccf7e1f84060bcf620c459bc27e (diff)
downloadqt-creator-60ccb2a425c2b55d15b8db75aa7b775e6752c02e.tar.gz
Debugger: Validate pointer *before* using it
Change-Id: I8bf80fcdd51b5db8e7c65adba551ca667912cd86 Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/debugger/qml/qmlcppengine.cpp')
-rw-r--r--src/plugins/debugger/qml/qmlcppengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 997c5eea60..2b1a2f9c64 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -88,11 +88,11 @@ QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp, QString *errorMess
d = new QmlCppEnginePrivate;
d->m_qmlEngine = new QmlEngine(sp, this);
d->m_cppEngine = DebuggerRunControlFactory::createEngine(sp.firstSlaveEngineType, sp, errorMessage);
- d->m_cppEngine->setMasterEngine(this);
if (!d->m_cppEngine) {
*errorMessage = tr("The slave debugging engine required for combined QML/C++-Debugging could not be created: %1").arg(*errorMessage);
return;
}
+ d->m_cppEngine->setMasterEngine(this);
setActiveEngine(d->m_cppEngine);
}