From a4cf7a71e32f6243a904dd8b3a0b14a527122035 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Fri, 27 Mar 2015 15:47:38 +0100
Subject: [PATCH] fix server deck storage; fix #744

---
 servatrice/src/serversocketinterface.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index 7a52cea6..3b23dc55 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -375,10 +375,15 @@ bool ServerSocketInterface::deckListHelper(int folderId, ServerInfo_DeckStorage_
     if (!sqlInterface->execSqlQuery(query))
         return false;
 
-    while (query->next()) {
+    QMap<int, QString> results;
+    while(query->next())
+        results[query->value(0).toInt()] = query->value(1).toString();
+
+    foreach(int key, results.keys())
+    {
         ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items();
-        newItem->set_id(query->value(0).toInt());
-        newItem->set_name(query->value(1).toString().toStdString());
+        newItem->set_id(key);
+        newItem->set_name(results.value(key).toStdString());
 
         if (!deckListHelper(newItem->id(), newItem->mutable_folder()))
             return false;