CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-907 improve Java testing and PermGen deprecation handling

Browse Source
This commit is contained in:
Petr Mrázek
2015-05-04 01:20:48 +02:00
parent 8e9d5f56b5
commit 1b884d0a9d
24 changed files with 515 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/MainWindow.cpp
View File

@ -381,7 +381,7 @@ namespace Ui {
#include "BaseInstance.h"
#include "BaseProcess.h"
#include "java/JavaUtils.h"
#include "NagUtils.h"
#include "JavaCommon.h"
#include "InstancePageProvider.h"
#include "minecraft/SkinUtils.h"
@ -1545,7 +1545,7 @@ void MainWindow::instanceActivated(QModelIndex index)
if (!inst)
return;
NagUtils::checkJVMArgs(inst->settings().get("JvmArgs").toString(), this);
JavaCommon::checkJVMArgs(inst->settings().get("JvmArgs").toString(), this);
doLaunch();
}
@ -1554,7 +1554,7 @@ void MainWindow::on_actionLaunchInstance_triggered()
{
if (m_selectedInstance)
{
NagUtils::checkJVMArgs(m_selectedInstance->settings().get("JvmArgs").toString(), this);
JavaCommon::checkJVMArgs(m_selectedInstance->settings().get("JvmArgs").toString(), this);
doLaunch();
}
}
@ -1563,7 +1563,7 @@ void MainWindow::on_actionLaunchInstanceOffline_triggered()
{
if (m_selectedInstance)
{
NagUtils::checkJVMArgs(m_selectedInstance->settings().get("JvmArgs").toString(), this);
JavaCommon::checkJVMArgs(m_selectedInstance->settings().get("JvmArgs").toString(), this);
doLaunch(false);
}
}