From 8badbdef38ce843dc443ddee219eda4040ef2cd5 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 5 Mar 2014 09:33:39 +0100 Subject: Now taskbar with notab can be specified in system.XWinrc --- xorg-server/hw/xwin/winshadddnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xorg-server/hw/xwin/winshadddnl.c') diff --git a/xorg-server/hw/xwin/winshadddnl.c b/xorg-server/hw/xwin/winshadddnl.c index 1ac1af06b..047482e09 100644 --- a/xorg-server/hw/xwin/winshadddnl.c +++ b/xorg-server/hw/xwin/winshadddnl.c @@ -35,6 +35,7 @@ #include #endif #include "win.h" +#include "winprefs.h" #define FAIL_MSG_MAX_BLT 10 @@ -722,7 +723,7 @@ winCloseScreenShadowDDNL(ScreenPtr pScreen) RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP); /* Delete tray icon, if we have one */ - if (!pScreenInfo->fNoTrayIcon) + if (!pScreenInfo->fNoTrayIcon && !pref.fNoTrayIcon) winDeleteNotifyIcon(pScreenPriv); /* Free the exit confirmation dialog box, if it exists */ -- cgit v1.2.3