Fix[log output]: change button invoke target

Fix[jar launcher]: localize Log Output button
PojavLauncherTeam · Nov 16, 2023 · 1f4fc38 · 1f4fc38
1 parent 74de96b
commit 1f4fc38
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Natives/JavaGUIViewController.m b/Natives/JavaGUIViewController.m
@@ -287,7 +287,7 @@ - (void)loadCustomControls {
         @"${margin}", @"${margin}",
         BTN_RECT
     )];
-    [dict[@"mControlDataList"] addObject:createButton(@"Log output",
+    [dict[@"mControlDataList"] addObject:createButton(localize(@"game.menu.log_output", nil),
         (int[]){SPECIALBTN_LOGOUTPUT,0,0,0},
         @"${right} - ${margin}", @"${margin}",
         BTN_RECT

diff --git a/Natives/PLLogOutputView.m b/Natives/PLLogOutputView.m
@@ -123,7 +123,11 @@ - (void)actionStartStopLogOutput {
 
 - (void)actionToggleLogOutput {
     if (fatalErrorOccurred) {
-        [self performSelector:@selector(actionForceClose)];
+        [UIApplication.sharedApplication performSelector:@selector(suspend)];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 200 * NSEC_PER_MSEC), dispatch_get_main_queue(), ^{
+            dispatch_group_leave(fatalExitGroup);
+            fatalExitGroup = nil;
+        });
         return;
     }
 
@@ -179,7 +183,7 @@ + (void)handleExitCode:(int)code {
             localize(@"game.title.exit_code", nil), code];
         navigationBar.items[0].leftBarButtonItem = [[UIBarButtonItem alloc]
             initWithBarButtonSystemItem:UIBarButtonSystemItemAction
-            target:currentVC() action:@selector(actionShareLatestlog)];
+            target:current action:@selector(actionShareLatestlog)];
         UIBarButtonItem *exitItem = navigationBar.items[0].rightBarButtonItems[0];
         navigationBar.items[0].rightBarButtonItems = nil;
         navigationBar.items[0].rightBarButtonItem = exitItem;