[Scummvm-git-logs] scummvm master -> 138295f617140a6133403e75eb0617677459ebff

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
138295f617 ANDROID: Minor optimization in clause evaluation for bugfix for 2.2.1beta1


Commit: 138295f617140a6133403e75eb0617677459ebff
    https://github.com/scummvm/scummvm/commit/138295f617140a6133403e75eb0617677459ebff
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2020-09-30T20:56:39+03:00

Commit Message:
ANDROID: Minor optimization in clause evaluation for bugfix for 2.2.1beta1

Changed paths:
    backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java


diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
index cf8f42327e..1c6edbd163 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
@@ -904,10 +904,10 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
 						//          and old version found is lower than 2.2.1
 						//       Then: replace our current config ini and remove the recovered ini from the aux external storage
 						if ((tmpOldVersionFound.compareTo(maxOldVersionFound) > 0)
-						     || (existingVersionFoundInScummVMDataDir.compareTo(version2_2_1_forPatch) == 0
+						     || (existingConfigInScummVMDataDirReplacedOnce == false
+						         && existingVersionFoundInScummVMDataDir.compareTo(version2_2_1_forPatch) == 0
 						         && tmpOldVersionFound.compareTo(version2_2_1_forPatch) < 0
-						         && oldConfigFileDescription.startsWith("A-")
-						         && existingConfigInScummVMDataDirReplacedOnce == false)
+						         && oldConfigFileDescription.startsWith("A-"))
 						) {
 							maxOldVersionFound = tmpOldVersionFound;
 							scummVMConfigHandled = false; // invalidate the handled flag, since we found a new great(er) version so we should re-use that one
@@ -1047,11 +1047,11 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
 			//       Then: Scan for previous usable ScummVM folder (it will still only copy the larger one found)
 			boolean scanOnlyInAuxExternalStorage = false;
 			if (defaultSaveDirFiles.length == 0
-			    || (existingVersionFoundInScummVMDataDir.compareTo(version2_2_1_forPatch) == 0
-			        && existingConfigInScummVMDataDirReplacedOnce == true)
+			    || (existingConfigInScummVMDataDirReplacedOnce == true
+			        && existingVersionFoundInScummVMDataDir.compareTo(version2_2_1_forPatch) == 0)
 			) {
-				if (existingVersionFoundInScummVMDataDir.compareTo(version2_2_1_forPatch) == 0
-					&& existingConfigInScummVMDataDirReplacedOnce == true) {
+				if (existingConfigInScummVMDataDirReplacedOnce == true
+					&& existingVersionFoundInScummVMDataDir.compareTo(version2_2_1_forPatch) == 0) {
 					scanOnlyInAuxExternalStorage = true;
 				}