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

Make sure window object is destryed.

Browse source
This commit is contained in:
Cheng Zhao 2014-04-23 10:53:07 +08:00
parent 1cb23a958c
commit 0eb982a972
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/api/atom_api_window.cc
View file

@ -11,7 +11,6 @@
#include "atom/common/native_mate_converters/value_converter.h" #include "atom/common/native_mate_converters/value_converter.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/callback.h" #include "base/callback.h"
#include "base/process/kill.h"
#include "content/public/browser/navigation_entry.h" #include "content/public/browser/navigation_entry.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
@ -74,6 +73,9 @@ Window::Window(base::DictionaryValue* options)
} }
Window::~Window() { Window::~Window() {
if (window_)
Destroy();
Emit("destroyed"); Emit("destroyed");
} }
@ -137,7 +139,7 @@ mate::Wrappable* Window::New(mate::Arguments* args,
} }
void Window::Destroy() { void Window::Destroy() {
base::KillProcess(window_->GetRenderProcessHandle(), 0, false); window_->DestroyWebContents();
window_->CloseImmediately(); window_->CloseImmediately();
} }