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

Fixup "AndroidDeviceDialog: show progress indicator on manual refresh too"

Browse Source 
This fixes segfault introduced with 4bdba9c (AndroidDeviceDialog: show
progress indicator on manual refresh too).

Change-Id: I72c7ead9de4abd46098ebf0ee0f8ce260669f088
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Martin Kampas
2015-12-03 18:27:43 +01:00
committed by Martin Kampas
parent d13ba08f9b
commit c5c8618aa1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -461,8 +461,6 @@ AndroidDeviceDialog::AndroidDeviceDialog(int apiLevel, const QString &abi, Andro
connect(&m_futureWatcherRefreshDevices, &QFutureWatcherBase::finished, connect(&m_futureWatcherRefreshDevices, &QFutureWatcherBase::finished,
this, &AndroidDeviceDialog::devicesRefreshed); this, &AndroidDeviceDialog::devicesRefreshed);
refreshDeviceList();
connect(m_ui->deviceView->selectionModel(), &QItemSelectionModel::currentChanged, connect(m_ui->deviceView->selectionModel(), &QItemSelectionModel::currentChanged,
this, &AndroidDeviceDialog::enableOkayButton); this, &AndroidDeviceDialog::enableOkayButton);
@@ -483,6 +481,8 @@ AndroidDeviceDialog::AndroidDeviceDialog(int apiLevel, const QString &abi, Andro
connect(m_ui->lookingForDeviceCancel, &QPushButton::clicked, connect(m_ui->lookingForDeviceCancel, &QPushButton::clicked,
this, &AndroidDeviceDialog::defaultDeviceClear); this, &AndroidDeviceDialog::defaultDeviceClear);
m_defaultDeviceTimer.start(); m_defaultDeviceTimer.start();
refreshDeviceList();
} }
AndroidDeviceDialog::~AndroidDeviceDialog() AndroidDeviceDialog::~AndroidDeviceDialog()