mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

mac: Always cancel application termination.

Browse source 
OS X's application termination doesn't work very well with C++ message
loops. Especially when we return NSTerminateLater for shouldTerminate,
it would be impossible for the C++ message loop to quit, because unless
we explictly let NSApp terminate the application, the message loop would
think the application is not terminated and will run forever.

The fix is to simply ignore the Cocoa's application termination request
and let the C++ message loop deal with it compeletey. But we had the
side effect that atom-shell would always cancel OS X's shutdown request,
this is also the approach chosen by Chromium.

Fixes #229.
Fixes atom/atom#1864.
This commit is contained in:
Cheng Zhao 2014-04-15 00:02:33 +08:00
parent 6f4aed83f0
commit b994ae8174
6 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/browser.h
View file

@ -91,9 +91,6 @@ class Browser : public WindowListObserver {
// Send the will-quit message and then shutdown the application.
void NotifyAndShutdown();
// Tell the system we have cancelled quiting.
void CancelQuit();
bool is_quiting_;
private: