From fd5fe4c7ee192f2f75914a7badb20b383432366c Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Fri, 1 May 2015 15:00:05 -0700
Subject: [PATCH] MGR: Fix a bug in setting column order which I introduced in
 my previous 2 commits.

---
 clientgui/BOINCListCtrl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/clientgui/BOINCListCtrl.cpp b/clientgui/BOINCListCtrl.cpp
index f739ad3e70..f38277ef3f 100644
--- a/clientgui/BOINCListCtrl.cpp
+++ b/clientgui/BOINCListCtrl.cpp
@@ -377,7 +377,8 @@ void CBOINCListCtrl::SetListColumnOrder(wxArrayString& orderArray) {
     }
     
 #ifdef wxHAS_LISTCTRL_COLUMN_ORDER
-    if ((shownColCount > 0) && (shownColCount <= stdCount) && (colCount > 0)) {
+    colCount = GetColumnCount();
+    if ((shownColCount > 0) && (shownColCount <= stdCount) && (colCount == shownColCount)) {
         SetColumnsOrder(aOrder);
     }
 #endif