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

Attach to Process: Fix crash

Browse Source 
When a non-desktop kit has no device

Change-Id: I108f3f65d151183be1d40d659dc331e9bc57c48e
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Orgad Shaneh
2012-10-23 21:15:06 +02:00
committed by hjk
parent 935f3de065
commit 40a6f0b1ca
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
View File

@@ -204,6 +204,10 @@ DeviceProcessesDialogPrivate::DeviceProcessesDialogPrivate(KitChooser *chooser,
void DeviceProcessesDialogPrivate::setDevice(const IDevice::ConstPtr &device) void DeviceProcessesDialogPrivate::setDevice(const IDevice::ConstPtr &device)
{ {
delete processList; delete processList;
processList = 0;
proxyModel.setSourceModel(0);
if (!device)
return;
processList = device->createProcessListModel(); processList = device->createProcessListModel();
QTC_ASSERT(processList, return); QTC_ASSERT(processList, return);
@@ -246,7 +250,7 @@ void DeviceProcessesDialogPrivate::updateProcessList()
void DeviceProcessesDialogPrivate::killProcess() void DeviceProcessesDialogPrivate::killProcess()
{ {
const QModelIndexList indexes = procView->selectionModel()->selectedIndexes(); const QModelIndexList indexes = procView->selectionModel()->selectedIndexes();
if (indexes.empty()) if (indexes.empty() || !processList)
return; return;
updateListButton->setEnabled(false); updateListButton->setEnabled(false);
killProcessButton->setEnabled(false); killProcessButton->setEnabled(false);
@@ -275,7 +279,7 @@ void DeviceProcessesDialogPrivate::updateButtons()
DeviceProcess DeviceProcessesDialogPrivate::selectedProcess() const DeviceProcess DeviceProcessesDialogPrivate::selectedProcess() const
{ {
const QModelIndexList indexes = procView->selectionModel()->selectedIndexes(); const QModelIndexList indexes = procView->selectionModel()->selectedIndexes();
if (indexes.empty()) if (indexes.empty() || !processList)
return DeviceProcess(); return DeviceProcess();
return processList->at(proxyModel.mapToSource(indexes.first()).row()); return processList->at(proxyModel.mapToSource(indexes.first()).row());
} }