Merge pull request #4912 from Vulpine05/Vulpine05-4888

[Manager] Freeze view when modifying columns
BOINC · Sep 6, 2022 · 3fc6c02 · 3fc6c02
2 parents c134d0f + 16df100
commit 3fc6c02
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/clientgui/BOINCListCtrl.cpp b/clientgui/BOINCListCtrl.cpp
@@ -349,11 +349,12 @@ void CBOINCListCtrl::SetListColumnOrder(wxArrayString& orderArray) {
     CBOINCBaseView* pView = (CBOINCBaseView*)GetParent();
     wxASSERT(wxDynamicCast(pView, CBOINCBaseView));
 
+    // Manager will crash if the scroll bar is not at the left-most position on the
+    // current view if columns are modified.
+    //
+    pView->Freeze();
     pView->m_iColumnIndexToColumnID.Clear();
-    for (i=colCount-1; i>=0; --i) {
-        DeleteColumn(i);
-    }
-
+    DeleteAllColumns();
     stdCount = pView->m_aStdColNameOrder->GetCount();
 
     pView->m_iColumnIDToColumnIndex.Clear();
@@ -412,6 +413,7 @@ void CBOINCListCtrl::SetListColumnOrder(wxArrayString& orderArray) {
         SetColumnsOrder(aOrder);
     }
 #endif
+    pView->Thaw();
 }