Skip to content

修复 macOS 26.5 上点击菜单栏闪退的 EXC_BREAKPOINT 崩溃 #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wyr1028 wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −2
Open

修复 macOS 26.5 上点击菜单栏闪退的 EXC_BREAKPOINT 崩溃 #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Ice/UI/IceBar/IceBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ final class IceBarPanel: NSPanel {
// can't currently display its menu bar items.
appState.menuBarManager.isMenuBarHiddenBySystemUserDefaults,
let info = window.flatMap({ WindowInfo(windowID: CGWindowID($0.windowNumber)) }),
info.windowID != 0,
// Window being offscreen means the menu bar is currently hidden.
// Close the bar, as things will start to look weird if we don't.
!info.isOnScreen
Expand Down
4 changes: 2 additions & 2 deletions Ice/Utilities/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ extension NSBezierPath {
shadow.shadowColor = color

// swiftlint:disable:next force_cast
let path = copy() as! NSBezierPath
guard let path = copy() as? NSBezierPath else { return }

context.saveGraphicsState()

Expand Down Expand Up @@ -429,7 +429,7 @@ extension NSScreen {
var displayID: CGDirectDisplayID {
// Value and type are guaranteed here, so force casting is okay.
// swiftlint:disable:next force_cast
deviceDescription[NSDeviceDescriptionKey("NSScreenNumber")] as! CGDirectDisplayID
deviceDescription((deviceDescription[NSDeviceDescriptionKey("NSScreenNumber")] as? NSNumber)?.uint32Value ?? 0
}

/// A Boolean value that indicates whether the screen has a notch.
Expand Down