summaryrefslogtreecommitdiffstats
path: root/gui/MainWindow.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-02-24 02:35:01 +0100
committerPetr Mrázek <peterix@gmail.com>2014-02-24 02:35:01 +0100
commit49dc9695f5204bb80a91214c411bcb1b868ee0db (patch)
treea7867064f70ab7888c32eebf42e4bdc8bc59c32e /gui/MainWindow.cpp
parentf7c97efcf3785f597417895945b24c2e7476cba8 (diff)
parent0b56b5efafffca77d6deee966097c55e78fb0aef (diff)
downloadMultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar
MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.gz
MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.lz
MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.xz
MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.zip
Merge branch 'fix_json_version' into integration_json_and_tools
Conflicts: logic/OneSixInstance.cpp logic/OneSixVersionBuilder.cpp Some fixage. Yay for conflicts.
Diffstat (limited to 'gui/MainWindow.cpp')
-rw-r--r--gui/MainWindow.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index ebbace52..121c2a73 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -357,6 +357,7 @@ void MainWindow::showInstanceContextMenu(const QPoint &pos)
QMenu myMenu;
myMenu.addActions(actions);
+ myMenu.setEnabled(m_selectedInstance->canLaunch());
myMenu.exec(view->mapToGlobal(pos));
}
@@ -1464,7 +1465,7 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
(BaseInstance *)current.data(InstanceList::InstancePointerRole)
.value<void *>()))
{
- ui->instanceToolBar->setEnabled(true);
+ ui->instanceToolBar->setEnabled(m_selectedInstance->canLaunch());
renameButton->setText(m_selectedInstance->name());
ui->actionChangeInstLWJGLVersion->setEnabled(
m_selectedInstance->menuActionEnabled("actionChangeInstLWJGLVersion"));