Minor fixes

joelfrederico · joelfrederico · commit a2ecd6445914 · 2021-11-29T23:00:39.000-05:00
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -1,4 +1,3 @@
-#include <objc/NSObjCRuntime.h>
 #define PY_SSIZE_T_CLEAN
 #include <Cocoa/Cocoa.h>
 #include <ApplicationServices/ApplicationServices.h>
@@ -639,27 +638,25 @@ int set_icon(PyObject* icon_path) {
         Py_DECREF(icon_path);
         return -1;
     }
-    NSString* ns_icon_path = [NSString stringWithUTF8String: icon_path_ptr];
-    if (!ns_icon_path) {
-        Py_DECREF(icon_path);
-        PyErr_SetString(PyExc_RuntimeError, "Could not convert to NSString*");
-        return -1;
-    }
-    NSImage* image = [[NSImage alloc] initByReferencingFile: ns_icon_path];
-    [ns_icon_path release];
-    if (!image) {
-        PyErr_SetString(PyExc_RuntimeError, "Could not create NSImage*");
-        [image release];
-        return -1;
-    }
-    if (!image.valid) {
-        PyErr_SetString(PyExc_RuntimeError, "Image is not valid");
-        [image release];
-        return -1;
+    @autoreleasepool {
+        NSString* ns_icon_path = [NSString stringWithUTF8String: icon_path_ptr];
+        if (!ns_icon_path) {
+            Py_DECREF(icon_path);
+            PyErr_SetString(PyExc_RuntimeError, "Could not convert to NSString*");
+            return -1;
+        }
+        NSImage* image = [[[NSImage alloc] initByReferencingFile: ns_icon_path] autorelease];
+        if (!image) {
+            PyErr_SetString(PyExc_RuntimeError, "Could not create NSImage*");
+            return -1;
+        }
+        if (!image.valid) {
+            PyErr_SetString(PyExc_RuntimeError, "Image is not valid");
+            return -1;
+        }
+        NSApplication* app = [NSApplication sharedApplication];
+        app.applicationIconImage = image;
     }
-    NSApplication* app = [NSApplication sharedApplication];
-    app.applicationIconImage = image;
-    [image release];
     return 0;
 }
 
