From a1f8bc4c5fe1f1098c5b6ee67d098d23d7c77f17 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 25 Nov 2014 15:42:26 +0100 Subject: [PATCH] ios: ensure that device and simulator scan with a developerPath Change-Id: Ifcc8d8f5c389c963ee1b6c2d2d2437bd5429f843 Reviewed-by: Fawzi Mohamed --- src/plugins/ios/iosconfigurations.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index c980c34002f..8b0772ca676 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -362,8 +362,6 @@ void IosConfigurations::initialize() { QTC_CHECK(m_instance == 0); m_instance = new IosConfigurations(0); - m_instance->updateSimulators(); - QTimer::singleShot(10000, IosDeviceManager::instance(), SLOT(monitorAvailableDevices())); } bool IosConfigurations::ignoreAllDevices() @@ -422,10 +420,15 @@ void IosConfigurations::updateSimulators() void IosConfigurations::setDeveloperPath(const FileName &devPath) { + static bool hasDevPath = false; if (devPath != m_instance->m_developerPath) { m_instance->m_developerPath = devPath; m_instance->save(); - updateAutomaticKitList(); + if (!hasDevPath && !devPath.isEmpty()) { + hasDevPath = true; + QTimer::singleShot(1000, IosDeviceManager::instance(), SLOT(monitorAvailableDevices())); + m_instance->updateSimulators(); + } emit m_instance->updated(); } }