From 8da9eecea755e19b8d1719e0183243a517a36591 Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Mon, 3 Aug 2015 19:24:00 +0300
Subject: [PATCH] Correct comparison of enum values in IdTableProxyModel

---
 apps/opencs/model/world/idtableproxymodel.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/model/world/idtableproxymodel.cpp b/apps/opencs/model/world/idtableproxymodel.cpp
index 10fd92b46..757285412 100644
--- a/apps/opencs/model/world/idtableproxymodel.cpp
+++ b/apps/opencs/model/world/idtableproxymodel.cpp
@@ -5,6 +5,18 @@
 
 #include "idtablebase.hpp"
 
+namespace
+{
+    std::string getEnumValue(const std::vector<std::string> &values, int index)
+    {
+        if (index < 0 || index >= static_cast<int>(values.size()))
+        {
+            return "";
+        }
+        return values[index];
+    }
+}
+
 void CSMWorld::IdTableProxyModel::updateColumnMap()
 {
     Q_ASSERT(mSourceModel != NULL);
@@ -93,7 +105,9 @@ bool CSMWorld::IdTableProxyModel::lessThan(const QModelIndex &left, const QModel
 
     if (valuesIt != mEnumColumnCache.end())
     {
-        return valuesIt->second[left.data().toInt()] < valuesIt->second[right.data().toInt()];
+        std::string first = getEnumValue(valuesIt->second, left.data().toInt());
+        std::string second = getEnumValue(valuesIt->second, right.data().toInt());
+        return first < second;
     }
     return QSortFilterProxyModel::lessThan(left, right);
 }