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

gtk: Free resources when closing window.

Browse source
This commit is contained in:
Cheng Zhao 2014-04-23 12:59:03 +08:00
parent 0c9aea3308
commit 3d267fc743
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/native_window_gtk.cc
View file

@ -121,10 +121,7 @@ NativeWindowGtk::NativeWindowGtk(content::WebContents* web_contents,
} }
NativeWindowGtk::~NativeWindowGtk() { NativeWindowGtk::~NativeWindowGtk() {
ui::ActiveWindowWatcherX::RemoveObserver(this); CloseImmediately();
if (window_)
gtk_widget_destroy(GTK_WIDGET(window_));
} }
void NativeWindowGtk::Close() { void NativeWindowGtk::Close() {
@ -132,7 +129,12 @@ void NativeWindowGtk::Close() {
} }
void NativeWindowGtk::CloseImmediately() { void NativeWindowGtk::CloseImmediately() {
if (window_ == NULL)
return;
NotifyWindowClosed(); NotifyWindowClosed();
ui::ActiveWindowWatcherX::RemoveObserver(this);
gtk_widget_destroy(GTK_WIDGET(window_)); gtk_widget_destroy(GTK_WIDGET(window_));
window_ = NULL; window_ = NULL;
} }