From cc2c917bc2babfa1a316fec81bd8637d786eec02 Mon Sep 17 00:00:00 2001
From: sgschantz <shawn_schantz@sil.org>
Date: Mon, 2 Sep 2024 15:56:50 +0700
Subject: [PATCH] fix(mac): nil window references after dismissing dialogs

also delete commented code
---
 .../KMConfigurationWindowController.m         | 28 ++-----------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m
index 027e4f9bc2..c99d632665 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m
+++ b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m
@@ -422,8 +422,8 @@
     if (returnCode == NSAlertFirstButtonReturn) {
       os_log_debug([KMLogs uiLog], "confirm delete keyboard alert dismissed");
       [self deleteFileAtIndex:[NSNumber numberWithInteger:deleteButton.tag]];
-      self.deleteAlertView = nil;
     }
+    self.deleteAlertView = nil;
   }];
 }
 
@@ -462,8 +462,9 @@
     os_log_debug([KMLogs uiLog], "confirm keyboard installation alert dismissed");
     if (returnCode == NSAlertFirstButtonReturn) {
       [self installPackageFile: package.getTempKmpFilename];
-      self.confirmKmpInstallAlertView = nil;
     }
+    [package releaseTempKMPFile];
+    self.confirmKmpInstallAlertView = nil;
   }];
 }
 
@@ -564,29 +565,6 @@
   return _confirmKmpInstallAlertView;
 }
 
-/*
-- (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
-  os_log_debug([KMLogs uiLog], "User responded to NSAlert");
-  if (alert == _deleteAlertView) {
-    if (returnCode == NSAlertFirstButtonReturn) { // Delete
-      [self deleteFileAtIndex:(__bridge NSNumber *)contextInfo];
-    }
-    
-    _deleteAlertView = nil;
-  }
-  else if (alert == _confirmKmpInstallAlertView) {
-    KMPackage *package = (__bridge KMPackage *)contextInfo;
-    os_log_debug([KMLogs uiLog], "KMP - Temp file: %{public}@", package.getTempKmpFilename);
-    if (returnCode == NSAlertFirstButtonReturn) { // Install
-      [self installPackageFile: package.getTempKmpFilename];
-    }
-    
-    [package releaseTempKMPFile];
-    _confirmKmpInstallAlertView = nil;
-  }
-  // else, just a message - nothing to do.
-}
-*/
 - (void)deleteFileAtIndex:(NSNumber *) n {
   NSInteger index = [n integerValue];
   NSString *path2Remove = nil;