*fix* issue 272

[chaz/tint2] / src / taskbar / task.c

diff --git a/src/taskbar/task.c b/src/taskbar/task.c
index a096af30d7332b43b7069c8f4a777f97b20f2bf5..af4c369396c87e19c53f7a12e11d2e91576e9ab8 100644 (file)
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -221,7 +221,7 @@ void get_icon (Task *tsk)
        }
 
        data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
-       if (data && i) {
+       if (data) {
                // get ARGB icon
                int w, h;
                long *tmp_data;
@@ -444,9 +444,11 @@ void active_task()
        //printf("Change active task %ld\n", w1);
 
        if (w1) {
-               Window w2;
-               if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
-                       if (w2 && !task_get_tasks(w1)) w1 = w2;
+               if (!task_get_tasks(w1)) {
+                       Window w2;
+                       while (XGetTransientForHint(server.dsp, w1, &w2))
+                               w1 = w2;
+               }
                set_task_state((task_active = task_get_task(w1)), TASK_ACTIVE);
        }
 }