From 101831b71e368ef6ca110a6673c1c8d245f7ba45 Mon Sep 17 00:00:00 2001 From: Juan Tejada Date: Sun, 20 Dec 2015 13:11:58 -0800 Subject: [PATCH] fix(feedback-window): Close correctly when in fullscreen mode - Now shows main window when feedback window is closed/hidden - Fixes #615 --- src/browser/window-manager.coffee | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/browser/window-manager.coffee b/src/browser/window-manager.coffee index 673782c36..8948cfe26 100644 --- a/src/browser/window-manager.coffee +++ b/src/browser/window-manager.coffee @@ -157,7 +157,7 @@ class WindowManager Feedback window ### - showFeedbackWindow: ({x, y, width, height, params}) -> + showFeedbackWindow: ({x, y, width, height, params}) => if @feedbackWindow @feedbackWindow.show() else @@ -177,11 +177,12 @@ class WindowManager event.preventDefault() # Disable window close, hide instead - w.on 'close', (event) -> + w.on 'close', (event) => unless global.application.quitting event.preventDefault() w.hide() - w.on 'closed', (event) -> + @showMainWindow() + w.on 'closed', (event) => @feedbackWindow = null w.webContents.on('new-window', onOpenURL)