From 8b7be66b5acb5a8bcf6ca8607aaa08afd1d58ae8 Mon Sep 17 00:00:00 2001
From: wj32 <wj32@21ef857c-d57f-4fe0-8362-d861dc6d29cd>
Date: Sat, 20 Dec 2008 06:44:54 +0000
Subject: [PATCH] ProcessTree: fix GetPath while being sorted, fix sorting
 orders

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@354 21ef857c-d57f-4fe0-8362-d861dc6d29cd
---
 .../Components/ProcessTree/ProcessTree.cs             |  6 +++---
 .../Components/ProcessTree/ProcessTreeModel.cs        | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/trunk/ProcessHacker/Components/ProcessTree/ProcessTree.cs b/trunk/ProcessHacker/Components/ProcessTree/ProcessTree.cs
index bc9a4c928..60260ab12 100644
--- a/trunk/ProcessHacker/Components/ProcessTree/ProcessTree.cs
+++ b/trunk/ProcessHacker/Components/ProcessTree/ProcessTree.cs
@@ -73,11 +73,11 @@ namespace ProcessHacker
         {
             if (e.Column.SortOrder == SortOrder.None)  
             {
-                e.Column.SortOrder = SortOrder.Ascending;
+                e.Column.SortOrder = SortOrder.Descending;
             }
-            else if (e.Column.SortOrder == SortOrder.Ascending) 
+            else if (e.Column.SortOrder == SortOrder.Descending) 
             {
-                e.Column.SortOrder = SortOrder.Descending;  
+                e.Column.SortOrder = SortOrder.Ascending;  
             }
             else
             {
diff --git a/trunk/ProcessHacker/Components/ProcessTree/ProcessTreeModel.cs b/trunk/ProcessHacker/Components/ProcessTree/ProcessTreeModel.cs
index f040d8ebf..74848ee42 100644
--- a/trunk/ProcessHacker/Components/ProcessTree/ProcessTreeModel.cs
+++ b/trunk/ProcessHacker/Components/ProcessTree/ProcessTreeModel.cs
@@ -106,6 +106,9 @@ namespace ProcessHacker
 
         public TreePath GetPath(ProcessNode node)
         {
+            if (this.GetSortColumn() != "")
+                return new TreePath(node);
+
             if (node == null)
                 return TreePath.Empty;
             else
@@ -145,8 +148,6 @@ namespace ProcessHacker
             get { return _processes; }
         }
 
-        #region ITreeModel Members
-
         public string GetSortColumn()
         {
             foreach (TreeColumn column in _tree.Tree.Columns)
@@ -168,9 +169,9 @@ namespace ProcessHacker
         public int ModifySort(int sortResult, SortOrder order)
         {
             if (order == SortOrder.Ascending)
-                return sortResult;
-            else if (order == SortOrder.Descending)
                 return sortResult * -1;
+            else if (order == SortOrder.Descending)
+                return sortResult;
             else
                 return 0;
         }
@@ -233,7 +234,5 @@ namespace ProcessHacker
         {
             this.StructureChanged(this, args);
         }
-
-        #endregion
     }
 }