Ticket #3905: COList.cpp.patch

source/gui/COList.cpp

@@ -359 +359 @@
     int selectedColumnOrder;
     GUI<int>::GetSetting(this, "selected_column_order", selectedColumnOrder);
 
-    CGUISpriteInstance* sprite_order;
-    CGUISpriteInstance* sprite_not_sorted;
-    if (selectedColumnOrder == 0)
-        LOGERROR("selected_column_order must not be 0");
-    else if (selectedColumnOrder != -1)
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_asc", sprite_order);
-    else
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_desc", sprite_order);
+    bool sortable;
+    GUI<bool>::GetSetting(this, "sortable", sortable);
+
+    CGUISpriteInstance* sprite_not_sorted;  
     GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_not_sorted", sprite_not_sorted);
 
     CStr selectedColumn;
@@ -385 +381 @@
 
         CPos leftTopCorner = m_CachedActualSize.TopLeft() + CPos(xpos, 0);
 
-        CGUISpriteInstance* sprite;
-        // If the list sorted by current column
-        if (selectedColumn == m_Columns[col].m_Id)
-            sprite = sprite_order;
-        else
-            sprite = sprite_not_sorted;
+        if (sortable)
+        {
+            CGUISpriteInstance* sprite;
+            // If the list sorted by current column
+            if (selectedColumn == m_Columns[col].m_Id)
+            {
+                if (selectedColumnOrder == 0)
+                    LOGERROR("selected_column_order must not be 0");
+                if (selectedColumnOrder != -1)
+                    GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_asc", sprite);
+                else
+                    GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_desc", sprite);
+            }
+            else
+                sprite = sprite_not_sorted;
 
-        // Draw sort arrows in colum header
-        GetGUI()->DrawSprite(*sprite, cell_id, bz + 0.1f, CRect(leftTopCorner + CPos(width - 16, 0), leftTopCorner + CPos(width, 16)));
-
+            // Draw sort arrows in colum header
+            GetGUI()->DrawSprite(*sprite, cell_id, bz + 0.1f, CRect(leftTopCorner + CPos(width - 16, 0), leftTopCorner + CPos(width, 16)));
+        }
         // Draw column header text
         DrawText(col, color, leftTopCorner + CPos(0, 4), bz + 0.1f, rect_head);
         xpos += width;