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

Merge remote-tracking branch 'origin/feature_fix_log' into integration_butchery

Browse Source 
Conflicts:
	logic/MinecraftProcess.cpp
This commit is contained in:
Petr Mrázek 2014-03-09 23:59:30 +01:00
commit d18b97ae3d
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
logic/MinecraftProcess.cpp
View File

@ -387,6 +387,7 @@ QStringList MinecraftProcess::javaArguments() const
args << QString("-Xms%1m").arg(m_instance->settings().get("MinMemAlloc").toInt()); args << QString("-Xms%1m").arg(m_instance->settings().get("MinMemAlloc").toInt());
args << QString("-Xmx%1m").arg(m_instance->settings().get("MaxMemAlloc").toInt()); args << QString("-Xmx%1m").arg(m_instance->settings().get("MaxMemAlloc").toInt());
args << QString("-XX:PermSize=%1m").arg(m_instance->settings().get("PermGen").toInt()); args << QString("-XX:PermSize=%1m").arg(m_instance->settings().get("PermGen").toInt());
args << "-Duser.language=en";
if (!m_nativeFolder.isEmpty()) if (!m_nativeFolder.isEmpty())
args << QString("-Djava.library.path=%1").arg(m_nativeFolder); args << QString("-Djava.library.path=%1").arg(m_nativeFolder);
args << "-jar" << PathCombine(MMC->bin(), "jars", "NewLaunch.jar"); args << "-jar" << PathCombine(MMC->bin(), "jars", "NewLaunch.jar");

14
logic/OneSixInstance.cpp
View File

@ -425,7 +425,19 @@ bool OneSixInstance::providesVersionFile() const
bool OneSixInstance::reload() bool OneSixInstance::reload()
{ {
return BaseInstance::reload() && reloadVersion(); if(BaseInstance::reload())
{
try
{
reloadVersion();
return true;
}
catch (...)
{
return false;
}
}
return false;
} }
QString OneSixInstance::loaderModsDir() const QString OneSixInstance::loaderModsDir() const