Merge branch 'fix_json_version' into integration_json_and_tools

Conflicts:
	logic/OneSixInstance.cpp
	logic/OneSixVersionBuilder.cpp

Some fixage. Yay for conflicts.

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"));