Fix: launcher not proceeding after fully downloaded

Turns out 2 last commits were pointless and didn't fix the root issue at all
PojavLauncherTeam · Aug 3, 2024 · 6935671 · 6935671
1 parent e021b7d
commit 6935671
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Natives/LauncherNavigationController.m b/Natives/LauncherNavigationController.m
@@ -331,7 +331,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
         self.progressViewMain.observedProgress = nil;
         if (self.task.metadata) {
             [self invokeAfterJITEnabled:^{
-                UIKit_launchMinecraftSurfaceVC(self.task.metadata);
+                UIKit_launchMinecraftSurfaceVC(self.view.window, self.task.metadata);
             }];
         } else {
             self.task = nil;

diff --git a/Natives/ios_uikit_bridge.h b/Natives/ios_uikit_bridge.h
@@ -9,7 +9,7 @@ UIViewController* tmpRootVC;
 
 void showDialog(NSString* title, NSString* message);
 jstring UIKit_accessClipboard(JNIEnv* env, jint action, jstring copySrc);
-void UIKit_launchMinecraftSurfaceVC(NSDictionary *metadata);
+void UIKit_launchMinecraftSurfaceVC(UIWindow *window, NSDictionary *metadata);
 void UIKit_returnToSplitView();
 void launchInitialViewController(UIWindow *window);
 

diff --git a/Natives/ios_uikit_bridge.m b/Natives/ios_uikit_bridge.m
@@ -107,12 +107,11 @@ jstring UIKit_accessClipboard(JNIEnv* env, jint action, jbyteArray copySrc) {
     }
 }
 
-void UIKit_launchMinecraftSurfaceVC(NSDictionary* metadata) {
+void UIKit_launchMinecraftSurfaceVC(UIWindow* window, NSDictionary* metadata) {
     // Leave this pref, might be useful later for launching with Quick Actions/Shortcuts/URL Scheme
     //setPreference(@"internal_launch_on_boot", getPreference(@"restart_before_launch"));
     setPrefObject(@"internal.selected_account", BaseAuthenticator.current.authData[@"username"]);
     dispatch_async(dispatch_get_main_queue(), ^{
-        UIWindow *window = currentWindow();
         tmpRootVC = window.rootViewController;
         [UIView animateWithDuration:0.2 animations:^{
             window.alpha = 0;