aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winwndproc.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-03-05 09:33:39 +0100
committermarha <marha@users.sourceforge.net>2014-03-05 09:33:39 +0100
commit8badbdef38ce843dc443ddee219eda4040ef2cd5 (patch)
treee44061aeab2425b199c89ec54b5caa909228492c /xorg-server/hw/xwin/winwndproc.c
parent45392e4a0642880b569ea5d4a350cdc395a2c7db (diff)
downloadvcxsrv-8badbdef38ce843dc443ddee219eda4040ef2cd5.tar.gz
vcxsrv-8badbdef38ce843dc443ddee219eda4040ef2cd5.tar.bz2
vcxsrv-8badbdef38ce843dc443ddee219eda4040ef2cd5.zip
Now taskbar with notab can be specified in system.XWinrc
Diffstat (limited to 'xorg-server/hw/xwin/winwndproc.c')
-rw-r--r--xorg-server/hw/xwin/winwndproc.c2
1 files changed, 1 insertions, 1 deletions
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.