From 826b47d6a46d2281e726edc34f27e8739cd0b318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Tak=C3=A1cs?=
 <93127072+PeterTakacs300@users.noreply.github.com>
Date: Wed, 13 Sep 2023 06:51:22 +0200
Subject: [PATCH] IDEMPIERE-5803 - Toolbar does not check if overlapped widow
 is closing with shortcut (#1997)

---
 .../src/org/adempiere/webui/adwindow/ADWindowToolbar.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
index 22fe19248b..c42fe363bd 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
@@ -594,8 +594,11 @@ public class ADWindowToolbar extends ToolBar implements EventListener<Event>
         	doOnClick(event);
         }
         else if(IDesktop.ON_CLOSE_WINDOW_SHORTCUT_EVENT.equals(eventName)) {
-        	if (windowNo > 0)
-    			SessionManager.getAppDesktop().closeWindow(windowNo);
+        	IDesktop desktop = SessionManager.getAppDesktop();
+        	if (windowNo > 0 && desktop.isCloseTabWithShortcut())
+        		desktop.closeWindow(windowNo);
+        	else
+        		desktop.setCloseTabWithShortcut(true);
         }
     }