[PATCH v3 0/1] MR6994: explorer: Avoid hiding the taskbar if it's enabled.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57515

--
  v3: explorer: Avoid hiding the taskbar if it's enabled.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6994

[PATCH v3 1/1] explorer: Avoid hiding the taskbar if it's enabled.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57515
---
 programs/explorer/systray.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c
index ae0d66b2901..fcbceb6fda4 100644
--- a/programs/explorer/systray.c
+++ b/programs/explorer/systray.c
@@ -1114,7 +1114,7 @@ static LRESULT WINAPI shell_traywnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LP
     {
         WINDOWPOS *p = (WINDOWPOS *)lparam;
 
-        if (p->flags & SWP_SHOWWINDOW && (!show_systray || (!nb_displayed && !enable_taskbar)))
+        if (p->flags & SWP_SHOWWINDOW && (!show_systray || !nb_displayed) && !enable_taskbar)
         {
             TRACE( "WM_WINDOWPOSCHANGING clearing SWP_SHOWWINDOW.\n" );
             p->flags &= ~SWP_SHOWWINDOW;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6994

[Rémi Bernon]

v3: Only include the fix?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6994#note_90406