[dchapyshev] 41373: - Fix Firefox 1.0/1.5 minimisation to taskbar Patch by Mikhail Denisenko ([e-mail]) See issue #2451 for more details.

Author: dchapyshev
Date: Wed Jun 10 22:44:31 2009
New Revision: 41373

URL: http://svn.reactos.org/svn/reactos?rev=41373&view=rev
Log:
- Fix Firefox 1.0/1.5 minimisation to taskbar
Patch by Mikhail Denisenko ([e-mail])

See issue #2451 for more details.

Modified:
    trunk/reactos/subsystems/win32/win32k/ntuser/window.c

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Jun 10 22:44:31 2009
@@ -3997,14 +3997,15 @@
    {
       Safepl.showCmd = SW_HIDE;
    }
-   else if (0 != (Window->Flags & WINDOWOBJECT_RESTOREMAX) ||
-            0 != (Wnd->Style & WS_MAXIMIZE))
-   {
-      Safepl.showCmd = SW_MAXIMIZE;
+   else if ((0 != (Window->Flags & WINDOWOBJECT_RESTOREMAX) ||
+            0 != (Wnd->Style & WS_MAXIMIZE)) &&
+            0 == (Wnd->Style & WS_MINIMIZE))
+   {
+      Safepl.showCmd = SW_SHOWMAXIMIZED;
    }
    else if (0 != (Wnd->Style & WS_MINIMIZE))
    {
-      Safepl.showCmd = SW_MINIMIZE;
+      Safepl.showCmd = SW_SHOWMINIMIZED;
    }
    else if (0 != (Wnd->Style & WS_VISIBLE))
    {