Skip to content

Commit

Permalink
Hotfix. Revert "cacheClosedWindowIfNeeded: make sure that the half-de…
Browse files Browse the repository at this point in the history 
…ad window that triggered the cache renewal is also in the cache"

This reverts commit f92dacb.

Because the assertion is sometimes false (I don't know yet why):
    ##### AeroSpace Runtime Error #####

    Please report to:
        https://github.com/nikitabobko/AeroSpace/issues/new
        Please describe what you did to trigger this error

    Message:
    Version: 0.0.0-SNAPSHOT
    Git hash: 7b88c46
    Coordinate: /Users/bobko/a/AeroSpace/Sources/AppBundle/tree/frozen/closedWindowsCache.swift:48:10 cacheClosedWindowIfNeeded(window:)
    recursionDetectorDuringFailure: false
    cli: false
    Displays have separate spaces: false

    Stacktrace:
    0   AeroSpace                           0x0000000102d73bc0 $s6Common6errorT_4file4line6column8functionxSS_SSS2iSStlFs5NeverO_Tg5 + 1104
    1   AeroSpace                           0x0000000102d9f328 $s6Common5check__4file4line6column8functionySb_SSyXKSSS2iSStF + 92
    2   AeroSpace                           0x0000000102c50558 $s9AppBundle25cacheClosedWindowIfNeeded6windowyAA0E0C_tF + 1116
    3   AeroSpace                           0x0000000102c37cec $s9AppBundle9MacWindowC14garbageCollect22skipClosedWindowsCacheySb_tF + 136
    4   AeroSpace                           0x0000000102c22d74 $s9AppBundle9gcWindowsyyF + 500
    5   AeroSpace                           0x0000000102c207a0 $s9AppBundle2gc33_9D4CAE07A16011BB7304F8F5007BD739LLyyF + 388
    6   AeroSpace                           0x0000000102c1d568 $s9AppBundle14refreshSession26screenIsDefinitelyUnlocked7startup4bodyxSb_SbxyXEtlFyt_Tg503$s9a32Bundle16refreshAndLayout26screenfG31Unlocked7startupySb_SbtFyyXEfU_Tf1nnnc_n + 272
    7   HIServices                          0x000000019e61da80 _XXMIGPostNotification + 896
    8   HIServices                          0x000000019e64efa0 _XPostNotification + 356
    9   HIServices                          0x000000019e5fe368 mshMIGPerform + 212
    10  CoreFoundation                      0x0000000197d622c8 __CFRUNLOOP_IS_CALLING_OUT_TO_A_SOURCE1_PERFORM_FUNCTION__ + 60
    11  CoreFoundation                      0x0000000197d621e8 __CFRunLoopDoSource1 + 524
    12  CoreFoundation                      0x0000000197d60b48 __CFRunLoopRun + 2248
    13  CoreFoundation                      0x0000000197d5fbc4 CFRunLoopRunSpecific + 588
    14  HIToolbox                           0x00000001a31cff64 RunCurrentEventLoopInMode + 292
    15  HIToolbox                           0x00000001a31d5d54 ReceiveNextEventCommon + 636
    16  HIToolbox                           0x00000001a31d5eb8 _BlockUntilNextEventMatchingListInModeWithFilter + 76
    17  AppKit                              0x000000019b88ba08 _DPSNextEvent + 660
    18  AppKit                              0x000000019c1cbe0c -[NSApplication(NSEventRouting) _nextEventMatchingEventMask:untilDate:inMode:dequeue:] + 688
    19  AppKit                              0x000000019b87eae0 -[NSApplication run] + 480
    20  AppKit                              0x000000019b855364 NSApplicationMain + 888
    21  SwiftUI                             0x00000001c5f05340 $s7SwiftUI6runAppys5NeverOSo21NSApplicationDelegate_So11NSResponderCXcFTf4e_nAA07TestingdG0C_Tg5Tm + 160
    22  SwiftUI                             0x00000001c6375ee4 $s7SwiftUI6runAppys5NeverOxAA0D0RzlF + 84
    23  SwiftUI                             0x00000001c66eef24 $s7SwiftUI3AppPAAE4mainyyFZ + 224
    24  AeroSpace                           0x0000000102bc0fc4 main + 36
    25  dyld                                0x00000001978f8274 start + 2840

I need to investigate why and reintroduce the assertion
  • Loading branch information
@nikitabobko
nikitabobko committed Dec 5, 2024
1 parent 7b88c46 commit 21336ad
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions Sources/AppBundle/tree/frozen/closedWindowsCache.swift
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import AppKit
import Common

/// First line of defence against lock screen
///
Expand Down Expand Up @@ -45,7 +44,6 @@ func cacheClosedWindowIfNeeded(window: Window) {
workspaces: Workspace.all.map { FrozenWorkspace($0) },
monitors: monitors.map(FrozenMonitor.init)
)
check(closedWindowsCache.windowIds.contains(window.windowId))
}

func restoreClosedWindowsCacheIfNeeded(newlyDetectedWindow: Window) -> Bool {
Expand Down

0 comments on commit 21336ad

Please sign in to comment.