github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove window from window list before notifying closed event

Browse Source
This commit is contained in:
Cheng Zhao
2015-06-27 17:01:20 +08:00
parent 4b4654ec71
commit 1e514620b5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atom/browser/api/atom_api_window.cc
View File

@@ -68,8 +68,6 @@ void Window::WillCloseWindow(bool* prevent_default) {
}
void Window::OnWindowClosed() {
Emit("closed");
if (api_web_contents_) {
api_web_contents_->DestroyWebContents();
api_web_contents_ = nullptr;
@@ -78,6 +76,8 @@ void Window::OnWindowClosed() {
RemoveFromWeakMap();
window_->RemoveObserver(this);
Emit("closed");
}
void Window::OnWindowBlur() {

4
atom/browser/native_window.cc
View File

@@ -443,10 +443,10 @@ void NativeWindow::NotifyWindowClosed() {
if (is_closed_)
return;
WindowList::RemoveWindow(this);
is_closed_ = true;
FOR_EACH_OBSERVER(NativeWindowObserver, observers_, OnWindowClosed());
WindowList::RemoveWindow(this);
}
void NativeWindow::NotifyWindowBlur() {