X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=5c96d54f1ca921c5713991d8f6546068bddce471;hb=7edd26ffa97a4da82e4b2ba46873f7578c42db70;hp=a7016b3ea403e463c590c8825e7440d263f316fd;hpb=e2715a85118ed183880c42dea2fad79402c896cb;p=chaz%2Ftint2

diff --git a/src/tint.c b/src/tint.c
index a7016b3..5c96d54 100644
--- 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++) {
@@ -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: