Ticket #3905: 3905_COList_refresh.patch

source/gui/COList.cpp

@@ -78 +78 @@
     float buffer_zone = 0.f;
     GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
 
+    CStr selectedColumn;
+    GUI<CStr>::GetSetting(this, "selected_column", selectedColumn);
     CStr defaultColumn;
     GUI<CStr>::GetSetting(this, "default_column", defaultColumn);
-    defaultColumn = "list_" + defaultColumn;
 
     for (size_t c = 0; c < m_ObjectsDefs.size(); ++c)
     {
@@ -90 +91 @@
         *text = GetGUI()->GenerateText(gui_string, font, width, buffer_zone, this);
         AddText(text);
 
-        if (m_SelectedDef == (size_t)-1 && defaultColumn == m_ObjectsDefs[c].m_Id)
+        if ("list_" + (selectedColumn.size() != 0 ? selectedColumn : defaultColumn) == m_ObjectsDefs[c].m_Id)
             m_SelectedDef = c;
     }
 
@@ -97 +98 @@
     if (m_SelectedDef != (size_t)-1)
         GUI<CStr>::SetSetting(this, "selected_column", m_ObjectsDefs[m_SelectedDef].m_Id.substr(5));
 
+    int selectedColumnOrder;
+    GUI<int>::GetSetting(this, "selected_column_order", selectedColumnOrder);
+
+    if (selectedColumnOrder != 0 && selectedColumnOrder != m_SelectedColumnOrder)
+        m_SelectedColumnOrder = selectedColumnOrder;
+
     if (m_SelectedColumnOrder == 0)
     {
         GUI<int>::GetSetting(this, "default_column_order", m_SelectedColumnOrder);