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

Andriod: fix "always use this device" button not working

Browse Source 
Fixes: QTCREATORBUG-23918
Change-Id: Ib9fa5bf0417f7fe028ec357b06d71577fa44c971
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-05-02 14:23:24 +03:00
parent bab97bf9b6
commit a18c59faca
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androiddevicedialog.cpp
View File

@@ -483,8 +483,12 @@ AndroidDeviceDialog::~AndroidDeviceDialog()
AndroidDeviceInfo AndroidDeviceDialog::device() AndroidDeviceInfo AndroidDeviceDialog::device()
{ {
refreshDeviceList();
if (!m_defaultDevice.isEmpty()) { 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 || return info.serialNumber == m_defaultDevice ||
info.avdname == m_defaultDevice; info.avdname == m_defaultDevice;
}); });
@@ -494,8 +498,6 @@ AndroidDeviceInfo AndroidDeviceDialog::device()
m_defaultDevice.clear(); m_defaultDevice.clear();
} }
refreshDeviceList();
if (exec() == QDialog::Accepted) if (exec() == QDialog::Accepted)
return m_model->device(m_ui->deviceView->currentIndex()); return m_model->device(m_ui->deviceView->currentIndex());
return AndroidDeviceInfo(); return AndroidDeviceInfo();