From 9030e34dea2116176bac4f1357e86d1fed03985a Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 19 Jul 2017 12:53:01 +0300 Subject: [PATCH] Debugger: Fix crash when interrupting while waiting for locals Change-Id: I9c8fbe14d238b2c2526598d4cbca561c7e9a5d0e Reviewed-by: Christian Stenger --- src/plugins/debugger/debuggerengine.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index efc1680458e..543ad8f8190 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -2030,7 +2030,11 @@ void DebuggerEngine::checkState(DebuggerState state, const char *file, int line) bool DebuggerEngine::isNativeMixedEnabled() const { - return runParameters().nativeMixedEnabled && (runParameters().languages & QmlLanguage); + if (DebuggerRunTool *rt = runTool()) { + const DebuggerRunParameters &runParams = rt->runParameters(); + return runParams.nativeMixedEnabled && (runParams.languages & QmlLanguage); + } + return false; } bool DebuggerEngine::isNativeMixedActive() const