summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@digia.com>2014-01-13 11:59:10 +0200
committerIikka Eklund <iikka.eklund@digia.com>2014-01-13 12:55:17 +0100
commitfaa8f39bdd8c13b21c19bec1592f18e710c56206 (patch)
treee759f0a6bcdb29b146e17ea862d8641e1c64aeed
parentd27ea0c55847dc8206d43ea2062cd568a049bf54 (diff)
ApplyProductKeyOperation::performOperation should return correctly
The ApplyProductKeyOperation::performOperation should return false whent the actual operation has failed. Currently even if the operation fails and returns false the installer will keep on installing without user interaction. Change-Id: I68020f8200cebbc45bca164d66fb876e170f3721 Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
-rw-r--r--src/libs/installer/applyproductkeyoperation.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/installer/applyproductkeyoperation.cpp b/src/libs/installer/applyproductkeyoperation.cpp
index 4556df743..5b561bd19 100644
--- a/src/libs/installer/applyproductkeyoperation.cpp
+++ b/src/libs/installer/applyproductkeyoperation.cpp
@@ -46,6 +46,7 @@ bool ApplyProductKeyOperation::performOperation()
if (!ProductKeyCheck::instance()->applyKey(arguments())) {
setError(UserDefinedError);
setErrorString(ProductKeyCheck::instance()->lastErrorString());
+ return false;
}
return true;
}