*fix* segfault when removing last virtual desktop while being on it

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index db4095985ffa2668afdf23ec237e8b55b13c1d47..5c96d54f1ca921c5713991d8f6546068bddce471 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -524,6 +524,9 @@ void event_property_notify (XEvent *e)
                else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) {
                        if (!taskbar_enabled) return;
                        server.nb_desktop = server_get_number_of_desktop ();
+                       if (server.nb_desktop <= server.desktop) {
+                               server.desktop = server.nb_desktop-1;
+                       }
                        cleanup_taskbar();
                        init_taskbar();
                        for (i=0 ; i < nb_panel ; i++) {
@@ -584,7 +587,7 @@ void event_property_notify (XEvent *e)
                        active_task();
                        panel_refresh = 1;
                }
-               else if (at == server.atom._XROOTPMAP_ID) {
+               else if (at == server.atom._XROOTPMAP_ID || at == server.atom._XROOTMAP_ID) {
                        // change Wallpaper
                        for (i=0 ; i < nb_panel ; i++) {
                                set_panel_background(&panel1[i]);
@@ -873,7 +876,6 @@ start:
                                                if (e.xmotion.state & button_mask)
                                                        event_button_motion_notify (&e);
 
-                                               if (!g_tooltip.enabled) break;
                                                Panel* panel = get_panel(e.xmotion.window);
                                                Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);
                                                if (area->_get_tooltip_text)
@@ -884,8 +886,7 @@ start:
                                        }
 
                                        case LeaveNotify:
-                                               if (g_tooltip.enabled)
-                                                       tooltip_trigger_hide();
+                                               tooltip_trigger_hide();
                                                break;
 
                                        case Expose: