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

Merge pull request #4968 from phamdaniel/exit-events

Browse source 
Don't emit 'will-quit' when 'app.exit()' is called.
This commit is contained in:
Cheng Zhao 2016-04-07 16:14:35 +09:00
commit efb0fc2ea5
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/browser.cc
View file

@ -15,6 +15,7 @@ namespace atom {
Browser::Browser() Browser::Browser()
: is_quiting_(false), : is_quiting_(false),
is_exiting_(false),
is_ready_(false), is_ready_(false),
is_shutdown_(false) { is_shutdown_(false) {
WindowList::AddObserver(this); WindowList::AddObserver(this);
@ -49,9 +50,12 @@ void Browser::Exit(int code) {
// Message loop is not ready, quit directly. // Message loop is not ready, quit directly.
exit(code); exit(code);
} else { } else {
// Prepare to quit when all windows have been closed.. // Prepare to quit when all windows have been closed.
is_quiting_ = true; is_quiting_ = true;
// Remember this caller so that we don't emit unrelated events.
is_exiting_ = true;
// Must destroy windows before quitting, otherwise bad things can happen. // Must destroy windows before quitting, otherwise bad things can happen.
atom::WindowList* window_list = atom::WindowList::GetInstance(); atom::WindowList* window_list = atom::WindowList::GetInstance();
if (window_list->size() == 0) { if (window_list->size() == 0) {
@ -175,7 +179,9 @@ void Browser::OnWindowCloseCancelled(NativeWindow* window) {
} }
void Browser::OnWindowAllClosed() { void Browser::OnWindowAllClosed() {
if (is_quiting_) if (is_exiting_)
Shutdown();
else if (is_quiting_)
NotifyAndShutdown(); NotifyAndShutdown();
else else
FOR_EACH_OBSERVER(BrowserObserver, observers_, OnWindowAllClosed()); FOR_EACH_OBSERVER(BrowserObserver, observers_, OnWindowAllClosed());

5
atom/browser/browser.h
View file

@ -189,10 +189,13 @@ class Browser : public WindowListObserver {
// Observers of the browser. // Observers of the browser.
base::ObserverList<BrowserObserver> observers_; base::ObserverList<BrowserObserver> observers_;
// Whether `app.exit()` has been called
bool is_exiting_;
// Whether "ready" event has been emitted. // Whether "ready" event has been emitted.
bool is_ready_; bool is_ready_;
// The browse is being shutdown. // The browser is being shutdown.
bool is_shutdown_; bool is_shutdown_;
std::string version_override_; std::string version_override_;