From bf5f5091ef6daeaf7067f4fc8973eb068ddc52fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 9 Aug 2013 00:26:35 +0200 Subject: Various task related improvements. * Errors are reported back to task users via Failure signals. * Lwjgl doesn't download on each legacy instance start anymore. * Tasks were unified when it comes to success/failure. * Task dialogs don't get spawned after short tasks finish anymore. --- backend/OneSixUpdate.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'backend/OneSixUpdate.cpp') diff --git a/backend/OneSixUpdate.cpp b/backend/OneSixUpdate.cpp index 84d8dfae..db15c923 100644 --- a/backend/OneSixUpdate.cpp +++ b/backend/OneSixUpdate.cpp @@ -43,7 +43,7 @@ void OneSixUpdate::executeTask() if(targetVersion == nullptr) { // don't do anything if it was invalid - emit gameUpdateComplete(); + emitSucceeded(); return; } @@ -104,8 +104,7 @@ void OneSixUpdate::versionFileFinished() void OneSixUpdate::versionFileFailed() { - error("Failed to download the version description. Try again."); - emitEnded(); + emitFailed("Failed to download the version description. Try again."); } void OneSixUpdate::jarlibStart() @@ -114,8 +113,7 @@ void OneSixUpdate::jarlibStart() bool successful = inst->reloadFullVersion(); if(!successful) { - error("Failed to load the version description file (version.json). It might be corrupted, missing or simply too new."); - emitEnded(); + emitFailed("Failed to load the version description file (version.json). It might be corrupted, missing or simply too new."); return; } @@ -149,13 +147,11 @@ void OneSixUpdate::jarlibStart() void OneSixUpdate::jarlibFinished() { - emit gameUpdateComplete(); - emitEnded(); + emitSucceeded(); } void OneSixUpdate::jarlibFailed() { - error("Failed to download the binary garbage. Try again. Maybe. IF YOU DARE"); - emitEnded(); + emitFailed("Failed to download the binary garbage. Try again. Maybe. IF YOU DARE"); } -- cgit v1.2.3