Merge pull request #2852 from rokm/fix-macos-default-icon-pyinstaller

cocoa: fix default icon search when standalone app is not an .app bundle
beeware · Sep 17, 2024 · 76ac0e1 · 76ac0e1
2 parents 3e503e8 + d65a461
commit 76ac0e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/changes/2852.bugfix.rst b/changes/2852.bugfix.rst
@@ -0,0 +1 @@
+Apps bundled as standalone frozen binaries (e.g., POSIX builds made with PyInstaller) no longer crash on startup when trying to resolve the app icon.
diff --git a/cocoa/src/toga_cocoa/icons.py b/cocoa/src/toga_cocoa/icons.py
@@ -18,11 +18,15 @@ def __init__(self, interface, path):
             # as an indicator that this is the app's default icon.
             # This bundle icon file definition might not contain an extension,
             # even thought the actual file will; so force the .icns extension.
-            bundle_icon = Path(
-                NSBundle.mainBundle.objectForInfoDictionaryKey("CFBundleIconFile")
+            bundle_icon = NSBundle.mainBundle.objectForInfoDictionaryKey(
+                "CFBundleIconFile"
             )
+            if bundle_icon is None:
+                # Not an .app bundle (e.g., POSIX build made with PyInstaller)
+                # This can't be tested as the testbed app is bundled by Briefcase.
+                raise FileNotFoundError()  # pragma: no cover
             path = NSBundle.mainBundle.pathForResource(
-                bundle_icon.stem,
+                Path(bundle_icon).stem,
                 ofType=".icns",
             )
             # If the icon file doesn't exist, raise the problem as FileNotFoundError