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/winwndproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xorg-server/hw/xwin/winwndproc.c') diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c index 6d4cb3a51..9444d229a 100644 --- a/xorg-server/hw/xwin/winwndproc.c +++ b/xorg-server/hw/xwin/winwndproc.c @@ -123,7 +123,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) SetProp(hwnd, WIN_SCR_PROP, s_pScreenPriv); /* Setup tray icon */ - if (!s_pScreenInfo->fNoTrayIcon) { + if (!s_pScreenInfo->fNoTrayIcon && !pref.fNoTrayIcon) { /* * NOTE: The WM_CREATE message is processed before CreateWindowEx * returns, so s_pScreenPriv->hwndScreen is invalid at this point. -- cgit v1.2.3