mirror of
https://github.com/storytold/gridcraft.git
synced 2026-10-30 05:37:00 -06:00
Merge pull request #316 from vangel76/fix/macos-quit-crash
macOS: end the process in on_exit so quitting doesn't crash (#117)
This commit is contained in:
@@ -54,6 +54,16 @@ impl eframe::App for App {
|
||||
}
|
||||
fn on_exit(&mut self) {
|
||||
save_prefs(&self.0);
|
||||
// macOS (#117): end the process here, before eframe tears the window down. AccessKit's
|
||||
// macOS adapter subclasses the window's content view and restores its class on teardown;
|
||||
// AppKit's Touch Bar support observes that view (KVO), so in the next display cycle
|
||||
// `-[_NSTouchBarFinderObservation invalidate]` throws "not registered" and the quit ends
|
||||
// in a crash report. eframe calls `on_exit` on every way of quitting (Quit/⌘Q, the Dock,
|
||||
// the close button, `app.quit`), and nothing after it is needed: the preferences are
|
||||
// saved and the log file is unbuffered. eframe does the same when it doesn't
|
||||
// run-and-return. `on_exit` only runs once the app exists, never on a failed start.
|
||||
#[cfg(target_os = "macos")]
|
||||
std::process::exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user