From 403f41efb77b06ddf6ecfe82e0ae40a5788f3687 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 10 Apr 2013 11:05:33 +0200 Subject: [PATCH] Fix potential assertion when removing Android device. The device manager does not like it when you remove non-existing devices. Change-Id: Ied1b28963a0513761c9cf247c414e0ea29dc8086 Reviewed-by: Friedemann Kleint Reviewed-by: Daniel Teske --- src/plugins/android/androidconfigurations.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index b4890e7be6d..64408836ea2 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -703,12 +703,11 @@ void AndroidConfigurations::load() void AndroidConfigurations::updateAndroidDevice() { + ProjectExplorer::DeviceManager * const devMgr = ProjectExplorer::DeviceManager::instance(); if (adbToolPath().toFileInfo().exists()) - ProjectExplorer::DeviceManager::instance() - ->addDevice(ProjectExplorer::IDevice::Ptr(new Internal::AndroidDevice)); - else - ProjectExplorer::DeviceManager::instance() - ->removeDevice(Core::Id(Constants::ANDROID_DEVICE_ID)); + devMgr->addDevice(ProjectExplorer::IDevice::Ptr(new Internal::AndroidDevice)); + else if (devMgr->find(Constants::ANDROID_DEVICE_ID)) + devMgr->removeDevice(Core::Id(Constants::ANDROID_DEVICE_ID)); } AndroidConfigurations *AndroidConfigurations::m_instance = 0;