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

Merge https://github.com/Drayshak/MultiMC5 into develop

Browse Source
This commit is contained in:
Petr Mrázek
2013-12-11 08:39:35 +01:00
parent bace3c2eab afa5e14e20
commit 26a7544325
13 changed files with 338 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
logic/OneSixUpdate.cpp
View File

@ -64,7 +64,8 @@ void OneSixUpdate::executeTask()
checker.reset(new JavaChecker());
connect(checker.get(), SIGNAL(checkFinished(JavaCheckResult)), this,
SLOT(checkFinishedOffline(JavaCheckResult)));
checker->performCheck(java_path);
checker->path = java_path;
checker->performCheck();
return;
}
@ -95,7 +96,8 @@ void OneSixUpdate::checkJavaOnline()
checker.reset(new JavaChecker());
connect(checker.get(), SIGNAL(checkFinished(JavaCheckResult)), this,
SLOT(checkFinishedOnline(JavaCheckResult)));
checker->performCheck(java_path);
checker->path = java_path;
checker->performCheck();
}
void OneSixUpdate::checkFinishedOnline(JavaCheckResult result)