Fixed logic In PreloadChoicesOperationPreloadChoiceSetError

1 files changed, 4 insertions, 4 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
index 6d8423027..de68e1ffc 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
@@ -73,6 +73,7 @@ class PreloadChoicesOperation extends Task {
 	private CompletionListener completionListener;
 	private boolean isRunning;
 	private boolean isVROptional;
+	private boolean choiceError = false;
 
 	PreloadChoicesOperation(ISdl internalInterface, FileManager fileManager, String displayName, WindowCapability defaultMainWindowCapability,
 								   Boolean isVROptional, HashSet<ChoiceCell> cellsToPreload, CompletionListener listener){
@@ -164,16 +165,15 @@ class PreloadChoicesOperation extends Task {
 				public void onFinished() {
 					isRunning = false;
 					DebugTool.logInfo(TAG, "Finished pre loading choice cells");
-					completionListener.onComplete(true);
-
+					completionListener.onComplete(!choiceError);
+					choiceError = false;
 					PreloadChoicesOperation.super.onFinished();
 				}
 
 				@Override
 				public void onError(int correlationId, Result resultCode, String info) {
 					DebugTool.logError(TAG, "There was an error uploading a choice cell: "+ info + " resultCode: " + resultCode);
-
-					PreloadChoicesOperation.super.onFinished();
+					choiceError = true;
 				}
 
 				@Override