*fix* modal windows with hidden parent or no parent are added to the taskbar

diff --git a/src/util/window.c b/src/util/window.c
index eaab1b7980ed6673bffabc43b554a4cccf5f2598..1aa08774e28f9f93369f5a49b3bdd87f53d4c0f7 100644 (file)
--- a/src/util/window.c
+++ b/src/util/window.c
@@ -33,6 +33,7 @@
 #include "window.h"
 #include "server.h"
 #include "panel.h"
+#include "taskbar.h"
 
 
 
@@ -86,8 +87,11 @@ int window_is_hidden (Window win)
                        return 1;
                }
                if (at[i] == server.atom._NET_WM_STATE_MODAL) {
-                       XFree(at);
-                       return 1;
+                       // do not add modal windows if the transient window is already in the taskbar
+                       if ( XGetTransientForHint(server.dsp, win, &window) && task_get_task(window) ) {
+                               XFree(at);
+                               return 1;
+                       }
                }
        }
        XFree(at);