github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-24 23:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only cancel unresponsive event when window close is cancelled.

Browse Source
This commit is contained in:
Cheng Zhao
2014-05-09 11:40:48 +08:00
parent 146ce284de
commit a070f0fdb6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
atom/browser/native_window.cc
View File

@@ -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,