[tfaber] 58192: [EXPLORER_NEW] - Restructure TaskSwitchWnd_CheckActivateTaskItem. No logic change intended.

Author: tfaber
Date: Fri Jan 18 23:34:51 2013
New Revision: 58192

URL: http://svn.reactos.org/svn/reactos?rev=58192&view=rev
Log:
[EXPLORER_NEW]
- Restructure TaskSwitchWnd_CheckActivateTaskItem. No logic change intended.

Modified:
    trunk/reactos/base/shell/explorer-new/taskswnd.c

Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tas...
==============================================================================
--- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Fri Jan 18 23:34:51 2013
@@ -945,58 +945,49 @@
     if (TaskItem != NULL)
         TaskGroup = TaskItem->Group;

-    if (This->IsGroupingEnabled && TaskGroup != NULL)
-    {
-        if (TaskGroup->IsCollapsed)
-        {
+    if (This->IsGroupingEnabled &&
+        TaskGroup != NULL &&
+        TaskGroup->IsCollapsed)
+    {
+        /* FIXME */
+        return;
+    }
+
+    if (ActiveTaskItem != NULL)
+    {
+        PTASK_GROUP ActiveTaskGroup;
+
+        if (ActiveTaskItem == TaskItem)
+            return;
+
+        ActiveTaskGroup = ActiveTaskItem->Group;
+
+        if (This->IsGroupingEnabled &&
+            ActiveTaskGroup != NULL &&
+            ActiveTaskGroup->IsCollapsed)
+        {
+            if (ActiveTaskGroup == TaskGroup)
+                return;
+
             /* FIXME */
         }
         else
-            goto ChangeTaskItemButton;
-    }
-    else
-    {
-ChangeTaskItemButton:
-        if (ActiveTaskItem != NULL)
-        {
-            PTASK_GROUP ActiveTaskGroup;
-
-            if (ActiveTaskItem == TaskItem)
-                return;
-
-            ActiveTaskGroup = ActiveTaskItem->Group;
-
-            if (This->IsGroupingEnabled && ActiveTaskGroup != NULL)
-            {
-                if (ActiveTaskGroup->IsCollapsed)
-                {
-                    if (ActiveTaskGroup == TaskGroup)
-                        return;
-
-                    /* FIXME */
-                }
-                else
-                    goto ChangeActiveTaskItemButton;
-            }
-            else
-            {
-ChangeActiveTaskItemButton:
-                This->ActiveTaskItem = NULL;
-                if (ActiveTaskItem->Index >= 0)
-                {
-                    TaskSwitchWnd_UpdateTaskItemButton(This,
-                                                       ActiveTaskItem);
-                }
-            }
-        }
-
-        This->ActiveTaskItem = TaskItem;
-
-        if (TaskItem != NULL && TaskItem->Index >= 0)
-        {
-            TaskSwitchWnd_UpdateTaskItemButton(This,
-                                               TaskItem);
-        }
+        {
+            This->ActiveTaskItem = NULL;
+            if (ActiveTaskItem->Index >= 0)
+            {
+                TaskSwitchWnd_UpdateTaskItemButton(This,
+                                                   ActiveTaskItem);
+            }
+        }
+    }
+
+    This->ActiveTaskItem = TaskItem;
+
+    if (TaskItem != NULL && TaskItem->Index >= 0)
+    {
+        TaskSwitchWnd_UpdateTaskItemButton(This,
+                                           TaskItem);
     }
 }