github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-25 15:28:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove window from observers when it's closed instead of deleted.

Browse Source
This commit is contained in:
Cheng Zhao
2014-04-23 09:25:04 +08:00
parent bccbc5e821
commit db39910455
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,8 +75,6 @@ Window::Window(base::DictionaryValue* options)
Window::~Window() {
Emit("destroyed");
window_->RemoveObserver(this);
}
void Window::OnPageTitleUpdated(bool* prevent_default,
@@ -99,9 +97,13 @@ void Window::WillCloseWindow(bool* prevent_default) {
void Window::OnWindowClosed() {
Emit("closed");
// Free memory when native window is closed, the delete is delayed so other
// observers would not get a invalid pointer of NativeWindow.
base::MessageLoop::current()->DeleteSoon(FROM_HERE, window_.release());
if (window_) {
window_->RemoveObserver(this);
// Free memory when native window is closed, the delete is delayed so other
// observers would not get a invalid pointer of NativeWindow.
base::MessageLoop::current()->DeleteSoon(FROM_HERE, window_.release());
}
}
void Window::OnWindowBlur() {