From f70cfa3c30e3aa6470e24fc32ee2629a9b214553 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Fri, 18 Jan 2013 23:34:51 +0000
Subject: [PATCH] [EXPLORER_NEW] - Restructure
 TaskSwitchWnd_CheckActivateTaskItem. No logic change intended.

svn path=/trunk/; revision=58192
---
 reactos/base/shell/explorer-new/taskswnd.c | 71 ++++++++++------------
 1 file changed, 31 insertions(+), 40 deletions(-)

diff --git a/reactos/base/shell/explorer-new/taskswnd.c b/reactos/base/shell/explorer-new/taskswnd.c
index aed9793db3e..7d3db2553ce 100644
--- a/reactos/base/shell/explorer-new/taskswnd.c
+++ b/reactos/base/shell/explorer-new/taskswnd.c
@@ -945,58 +945,49 @@ TaskSwitchWnd_CheckActivateTaskItem(IN OUT PTASK_SWITCH_WND This,
     if (TaskItem != NULL)
         TaskGroup = TaskItem->Group;
 
-    if (This->IsGroupingEnabled && TaskGroup != NULL)
+    if (This->IsGroupingEnabled &&
+        TaskGroup != NULL &&
+        TaskGroup->IsCollapsed)
     {
-        if (TaskGroup->IsCollapsed)
-        {
-            /* FIXME */
-        }
-        else
-            goto ChangeTaskItemButton;
+        /* FIXME */
+        return;
     }
-    else
+
+    if (ActiveTaskItem != NULL)
     {
-ChangeTaskItemButton:
-        if (ActiveTaskItem != NULL)
-        {
-            PTASK_GROUP ActiveTaskGroup;
+        PTASK_GROUP ActiveTaskGroup;
 
-            if (ActiveTaskItem == TaskItem)
-                return;
+        if (ActiveTaskItem == TaskItem)
+            return;
 
-            ActiveTaskGroup = ActiveTaskItem->Group;
+        ActiveTaskGroup = ActiveTaskItem->Group;
 
-            if (This->IsGroupingEnabled && ActiveTaskGroup != NULL)
-            {
-                if (ActiveTaskGroup->IsCollapsed)
-                {
-                    if (ActiveTaskGroup == TaskGroup)
-                        return;
+        if (This->IsGroupingEnabled &&
+            ActiveTaskGroup != NULL &&
+            ActiveTaskGroup->IsCollapsed)
+        {
+            if (ActiveTaskGroup == TaskGroup)
+                return;
 
-                    /* FIXME */
-                }
-                else
-                    goto ChangeActiveTaskItemButton;
-            }
-            else
+            /* FIXME */
+        }
+        else
+        {
+            This->ActiveTaskItem = NULL;
+            if (ActiveTaskItem->Index >= 0)
             {
-ChangeActiveTaskItemButton:
-                This->ActiveTaskItem = NULL;
-                if (ActiveTaskItem->Index >= 0)
-                {
-                    TaskSwitchWnd_UpdateTaskItemButton(This,
-                                                       ActiveTaskItem);
-                }
+                TaskSwitchWnd_UpdateTaskItemButton(This,
+                                                   ActiveTaskItem);
             }
         }
+    }
 
-        This->ActiveTaskItem = TaskItem;
+    This->ActiveTaskItem = TaskItem;
 
-        if (TaskItem != NULL && TaskItem->Index >= 0)
-        {
-            TaskSwitchWnd_UpdateTaskItemButton(This,
-                                               TaskItem);
-        }
+    if (TaskItem != NULL && TaskItem->Index >= 0)
+    {
+        TaskSwitchWnd_UpdateTaskItemButton(This,
+                                           TaskItem);
     }
 }
 
-- 
2.17.1