From 7cd74e2004dc0a1bd1b91e1c6d5f8eb7adfe971f Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Wed, 15 Sep 2021 09:30:48 +0700 Subject: [PATCH] Bug fix: version index is not set This lead to wrong selected version in some cases. --- Natives/LauncherViewController.m | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Natives/LauncherViewController.m b/Natives/LauncherViewController.m index 3099de11..35a8bfc0 100644 --- a/Natives/LauncherViewController.m +++ b/Natives/LauncherViewController.m @@ -165,19 +165,18 @@ int versionSelectedAt = 0; for (NSDictionary *versionInfo in remoteVersionList) { NSString *versionId = [versionInfo valueForKey:@"id"]; NSString *versionType = [versionInfo valueForKey:@"type"]; - if ([versionType containsString:@"release"] && [getPreference(@"vertype_release") boolValue] == YES) { + if (([versionType containsString:@"release"] && [getPreference(@"vertype_release") boolValue]) || + ([versionType containsString:@"snapshot"] && [getPreference(@"vertype_snapshot") boolValue]) || + ([versionType containsString:@"old_beta"] && [getPreference(@"vertype_oldbeta") boolValue]) || + ([versionType containsString:@"old_alpha"] && [getPreference(@"vertype_oldalpha") boolValue]) || + [versionType containsString:@"modified"]) { [finalVersionList addObject:versionInfo]; - } else if ([versionType containsString:@"snapshot"] && [getPreference(@"vertype_snapshot") boolValue] == YES) { - [finalVersionList addObject:versionInfo]; - } else if ([versionType containsString:@"old_beta"] && [getPreference(@"vertype_oldbeta") boolValue] == YES) { - [finalVersionList addObject:versionInfo]; - } else if ([versionType containsString:@"old_alpha"] && [getPreference(@"vertype_oldalpha") boolValue] == YES) { - [finalVersionList addObject:versionInfo]; - } else - if ([versionTextField.text isEqualToString:versionId]) { - versionSelectedAt = i; + + if ([versionTextField.text isEqualToString:versionId]) { + versionSelectedAt = i; + } + i++; } - i++; } [self fetchLocalVersionList:finalVersionList withPreviousIndex:i];