- fix for restoring applications using task bar buttons

- project file maintainancement
- docu update

svn path=/trunk/; revision=8451

diff --git a/reactos/subsys/system/explorer/doc/changes.txt b/reactos/subsys/system/explorer/doc/changes.txt
index b686e73..7715b52 100644 (file)
--- a/reactos/subsys/system/explorer/doc/changes.txt
+++ b/reactos/subsys/system/explorer/doc/changes.txt
@@ -67,3 +67,4 @@ If you search for more information, look into the CVS repository.
                                                fixes for leaking GDI handles
 25.02.2004     m. fuchs        rebar control for desktop bar
 28.02.2004     m. fuchs        "minimize all" functionality
+                                               various fixes for notification icons, task bar and desktop switching

diff --git a/reactos/subsys/system/explorer/taskbar/taskbar.cpp b/reactos/subsys/system/explorer/taskbar/taskbar.cpp
index 5027c0c..6eb73ab 100644 (file)
--- a/reactos/subsys/system/explorer/taskbar/taskbar.cpp
+++ b/reactos/subsys/system/explorer/taskbar/taskbar.cpp
@@ -201,7 +201,9 @@ int TaskBar::Notify(int id, NMHDR* pnmh)
 void TaskBar::ActivateApp(TaskBarMap::iterator it, bool can_minimize)
 {
        HWND hwnd = it->first;
-       bool minimize_it = can_minimize && (hwnd==GetForegroundWindow() || hwnd==_last_foreground_wnd);
+
+       bool minimize_it = can_minimize && !IsIconic(hwnd) &&
+                                               (hwnd==GetForegroundWindow() || hwnd==_last_foreground_wnd);
 
         // switch to selected application window
        if (!minimize_it)