feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix potential assertion when removing Android device.

Browse Source 
The device manager does not like it when you remove non-existing
devices.

Change-Id: Ied1b28963a0513761c9cf247c414e0ea29dc8086
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Christian Kandeler
2013-04-10 11:05:33 +02:00
parent 4a45c1c165
commit 403f41efb7
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androidconfigurations.cpp
View File

@@ -703,12 +703,11 @@ void AndroidConfigurations::load()
void AndroidConfigurations::updateAndroidDevice() void AndroidConfigurations::updateAndroidDevice()
{ {
ProjectExplorer::DeviceManager * const devMgr = ProjectExplorer::DeviceManager::instance();
if (adbToolPath().toFileInfo().exists()) if (adbToolPath().toFileInfo().exists())
ProjectExplorer::DeviceManager::instance() devMgr->addDevice(ProjectExplorer::IDevice::Ptr(new Internal::AndroidDevice));
->addDevice(ProjectExplorer::IDevice::Ptr(new Internal::AndroidDevice)); else if (devMgr->find(Constants::ANDROID_DEVICE_ID))
else devMgr->removeDevice(Core::Id(Constants::ANDROID_DEVICE_ID));
ProjectExplorer::DeviceManager::instance()
->removeDevice(Core::Id(Constants::ANDROID_DEVICE_ID));
} }
AndroidConfigurations *AndroidConfigurations::m_instance = 0; AndroidConfigurations *AndroidConfigurations::m_instance = 0;