0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix last instance remaining selected when deleted

Browse Source
This commit is contained in:
Petr Mrázek 2014-05-11 19:32:17 +02:00
parent 68ef451be5
commit 6d34411f54
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gui/MainWindow.cpp
View File

@ -870,17 +870,14 @@ void MainWindow::updateInstanceToolIcon(QString new_icon)
void MainWindow::setSelectedInstanceById(const QString &id) void MainWindow::setSelectedInstanceById(const QString &id)
{ {
QModelIndex selectionIndex = proxymodel->index(0, 0); if (id.isNull())
if (!id.isNull()) return;
const QModelIndex index = MMC->instances()->getInstanceIndexById(id);
if (index.isValid())
{ {
const QModelIndex index = MMC->instances()->getInstanceIndexById(id); QModelIndex selectionIndex = proxymodel->mapFromSource(index);
if (index.isValid()) view->selectionModel()->setCurrentIndex(selectionIndex, QItemSelectionModel::ClearAndSelect);
{
selectionIndex = proxymodel->mapFromSource(index);
}
} }
view->selectionModel()->setCurrentIndex(selectionIndex,
QItemSelectionModel::ClearAndSelect);
} }
void MainWindow::on_actionChangeInstGroup_triggered() void MainWindow::on_actionChangeInstGroup_triggered()
@ -1347,14 +1344,14 @@ void MainWindow::openWebPage(QUrl url)
void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &previous) void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &previous)
{ {
if(!current.isValid()) if(!current.isValid())
{ {
selectionBad(); MMC->settings()->set("SelectedInstance", QString());
MMC->settings()->set("SelectedInstance", QString()); selectionBad();
return; return;
} }
QString id = current.data(InstanceList::InstanceIDRole).toString(); QString id = current.data(InstanceList::InstanceIDRole).toString();
m_selectedInstance = MMC->instances()->getInstanceById(id); m_selectedInstance = MMC->instances()->getInstanceById(id);
if ( m_selectedInstance ) if ( m_selectedInstance )
{ {
ui->instanceToolBar->setEnabled(m_selectedInstance->canLaunch()); ui->instanceToolBar->setEnabled(m_selectedInstance->canLaunch());
@ -1370,9 +1367,9 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
} }
else else
{ {
selectionBad(); MMC->settings()->set("SelectedInstance", QString());
MMC->settings()->set("SelectedInstance", QString()); selectionBad();
return; return;
} }
} }