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

Fix java detection segfault

Browse Source
This commit is contained in:
Petr Mrázek 2013-10-24 01:47:54 +02:00
parent c8b84257ae
commit ba938dd8e2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gui/mainwindow.cpp
View File

@ -834,18 +834,20 @@ void MainWindow::checkSetDefaultJava()
vselect.setResizeOn(2); vselect.setResizeOn(2);
vselect.exec(); vselect.exec();
if (!vselect.selectedVersion()) if (vselect.selectedVersion())
java = std::dynamic_pointer_cast<JavaVersion>(vselect.selectedVersion());
else
{ {
QMessageBox::warning(this, tr("Invalid version selected"), QMessageBox::warning(this, tr("Invalid version selected"),
tr("You didn't select a valid Java version, so MultiMC will " tr("You didn't select a valid Java version, so MultiMC will "
"select the default. " "select the default. "
"You can change this in the settings dialog.")); "You can change this in the settings dialog."));
JavaUtils ju; JavaUtils ju;
java = ju.GetDefaultJava(); java = ju.GetDefaultJava();
} }
if(java)
java = std::dynamic_pointer_cast<JavaVersion>(vselect.selectedVersion()); MMC->settings()->set("JavaPath", java->path);
MMC->settings()->set("JavaPath", java->path); else
MMC->settings()->set("JavaPath", QString("java"));
} }
} }