From a070f0fdb6be5d22d1dcc434570bb5edbb770c73 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 9 May 2014 11:40:48 +0800 Subject: [PATCH] Only cancel unresponsive event when window close is cancelled. --- atom/browser/native_window.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index e8877ff..4e5038f 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -404,11 +404,12 @@ void NativeWindow::BeforeUnloadFired(content::WebContents* tab, bool* proceed_to_fire_unload) { *proceed_to_fire_unload = proceed; - if (!proceed) + if (!proceed) { WindowList::WindowCloseCancelled(this); - // When the "beforeunload" callback is fired the window is certainly live. - window_unresposive_closure_.Cancel(); + // Cancel unresponsive event when window close is cancelled. + window_unresposive_closure_.Cancel(); + } } void NativeWindow::RequestToLockMouse(content::WebContents* web_contents, -- 2.7.4