summaryrefslogtreecommitdiffstats
path: root/logic/OneSixUpdate.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-12-11 08:39:35 +0100
committerPetr Mrázek <peterix@gmail.com>2013-12-11 08:39:35 +0100
commit26a7544325f8fd8939567b270bde9ad1db465f9f (patch)
treea901f9bee1cb6ff019b95fa2776b0dd3be1b45c3 /logic/OneSixUpdate.cpp
parentbace3c2eab1effd556ab2c704b26220312e05eb3 (diff)
parentafa5e14e2074343270ff205e042f102c03dface0 (diff)
downloadMultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar
MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar.gz
MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar.lz
MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.tar.xz
MultiMC-26a7544325f8fd8939567b270bde9ad1db465f9f.zip
Merge https://github.com/Drayshak/MultiMC5 into develop
Diffstat (limited to 'logic/OneSixUpdate.cpp')
-rw-r--r--logic/OneSixUpdate.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp
index c4528f91..39064de8 100644
--- a/logic/OneSixUpdate.cpp
+++ b/logic/OneSixUpdate.cpp
@@ -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)