From de515ccfd5bcaa53429f720e093a2378466c262d Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Thu, 31 Oct 2013 18:11:33 +0100 Subject: [PATCH] ios: fixing debugging handling when debugger is missing Change-Id: I1178e5fddd9bf6ed4985b029f03478e3ba2a89b8 Reviewed-by: Eike Ziller Reviewed-by: hjk --- src/plugins/ios/iosconfigurations.cpp | 2 +- src/plugins/ios/iosdebugsupport.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 746fea4415e..83fd2803ab7 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -312,7 +312,7 @@ void IosConfigurations::updateAutomaticKitList() //DeviceKitInformation::setDevice(newKit, device); Debugger::DebuggerItem debugger; - debugger.setCommand(pToolchain->suggestedDebugger()); // use lldbPath() instead? + debugger.setCommand(lldbPath()); debugger.setEngineType(Debugger::LldbEngineType); debugger.setDisplayName(tr("IOS Debugger")); debugger.setAutoDetected(true); diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp index 6ce8ee49e69..66c3919ecbf 100644 --- a/src/plugins/ios/iosdebugsupport.cpp +++ b/src/plugins/ios/iosdebugsupport.cpp @@ -109,7 +109,8 @@ RunControl *IosDebugSupport::createDebugRunControl(IosRunConfiguration *runConfi DebuggerRunControl * const debuggerRunControl = DebuggerPlugin::createDebugger(params, runConfig, errorMessage); - new IosDebugSupport(runConfig, debuggerRunControl); + if (debuggerRunControl) + new IosDebugSupport(runConfig, debuggerRunControl); return debuggerRunControl; }