From 8e9cad0753457ce3d245a626fb4ad693e5701703 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Sun, 9 Nov 2014 12:06:54 +0100
Subject: Add error management. Protect sort node after scalar result node.

---
 node/sortresult.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'node/sortresult.cpp')

diff --git a/node/sortresult.cpp b/node/sortresult.cpp
index 8a0e58d..c80ebec 100644
--- a/node/sortresult.cpp
+++ b/node/sortresult.cpp
@@ -17,7 +17,7 @@ void SortResultNode::run(ExecutionNode* node)
     {
         return;
     }
-    DiceResult* previousDiceResult = static_cast<DiceResult*>(node->getResult());
+    DiceResult* previousDiceResult = dynamic_cast<DiceResult*>(node->getResult());
     m_diceResult->setPrevious(previousDiceResult);
     if(NULL!=previousDiceResult)
     {
@@ -61,12 +61,7 @@ void SortResultNode::run(ExecutionNode* node)
                 }
 
             }
-            //qDebug() << tmp1->getValue() << j  << found;
-            //if(found)
-                diceList2.insert(j,tmp1);
-            /*else
-                diceList2.append(tmp1);*/
-
+            diceList2.insert(j,tmp1);
         }
 
         if(!m_ascending)
@@ -86,6 +81,10 @@ void SortResultNode::run(ExecutionNode* node)
             m_nextNode->run(this);
         }
     }
+    else
+    {
+            m_errors.append(DIE_RESULT_EXPECTED);
+    }
 
 }
 void SortResultNode::setSortAscending(bool asc)
-- 
cgit v1.2.3-70-g09d2