diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-05-02 14:23:24 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-05-05 16:00:28 +0000 |
| commit | a18c59faca243015a1c06f82a6e52eb64c205568 (patch) | |
| tree | 00649f6b2eaa2c90300f898b66ffbca97d66fc2c | |
| parent | bab97bf9b6e2060af8d56918e709a09fb0aeebef (diff) | |
Andriod: fix "always use this device" button not working
Fixes: QTCREATORBUG-23918
Change-Id: Ib9fa5bf0417f7fe028ec357b06d71577fa44c971
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/android/androiddevicedialog.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/android/androiddevicedialog.cpp b/src/plugins/android/androiddevicedialog.cpp index a2783d4d51..35da26b24c 100644 --- a/src/plugins/android/androiddevicedialog.cpp +++ b/src/plugins/android/androiddevicedialog.cpp @@ -483,8 +483,12 @@ AndroidDeviceDialog::~AndroidDeviceDialog() AndroidDeviceInfo AndroidDeviceDialog::device() { + refreshDeviceList(); + if (!m_defaultDevice.isEmpty()) { - auto device = std::find_if(m_connectedDevices.begin(), m_connectedDevices.end(), [this](const AndroidDeviceInfo& info) { + auto device = std::find_if(m_connectedDevices.begin(), + m_connectedDevices.end(), + [this](const AndroidDeviceInfo &info) { return info.serialNumber == m_defaultDevice || info.avdname == m_defaultDevice; }); @@ -494,8 +498,6 @@ AndroidDeviceInfo AndroidDeviceDialog::device() m_defaultDevice.clear(); } - refreshDeviceList(); - if (exec() == QDialog::Accepted) return m_model->device(m_ui->deviceView->currentIndex()); return AndroidDeviceInfo(); |