closing a window from the workspace menu should close the chosen client,

rather than the active tab in the same window

1 files changed, 6 insertions, 2 deletions

diff --git a/src/Window.cc b/src/Window.cc
index 1b3ef2f..c505edc 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3870,12 +3870,16 @@ void FluxboxWindow::sendConfigureNotify(bool send_to_netizens) {
 
 
 void FluxboxWindow::close() {
-    if (m_client)
+    if (WindowCmd<void>::window() == this && WindowCmd<void>::client())
+        WindowCmd<void>::client()->sendClose(false);
+    else if (m_client)
         m_client->sendClose(false);
 }
 
 void FluxboxWindow::kill() {
-    if (m_client)
+    if (WindowCmd<void>::window() == this && WindowCmd<void>::client())
+        WindowCmd<void>::client()->sendClose(true);
+    else if (m_client)
         m_client->sendClose(true);
 }