Merge branch 'master' of github.com:Rolisteam/DiceParser

1 files changed, 9 insertions, 7 deletions

diff --git a/node/filternode.cpp b/node/filternode.cpp
index 0be2e62..5153c79 100644
--- a/node/filternode.cpp
+++ b/node/filternode.cpp
@@ -8,7 +8,7 @@ FilterNode::FilterNode()
 
 FilterNode::~FilterNode()
 {
-    if(nullptr!=m_validator)
+    if(NULL!=m_validator)
     {
         delete m_validator;
     }
@@ -20,13 +20,13 @@ void FilterNode::setValidator(Validator* validator)
 void FilterNode::run(ExecutionNode* previous)
 {
     m_previousNode = previous;
-    if(nullptr==previous)
+    if(NULL==previous)
     {
         return;
     }
     DiceResult* previousDiceResult = static_cast<DiceResult*>(previous->getResult());
     m_result->setPrevious(previousDiceResult);
-    if(nullptr!=previousDiceResult)
+    if(NULL!=previousDiceResult)
     {
         QList<Die*> diceList=previousDiceResult->getResultList();
         QList<Die*> diceList2;
@@ -48,7 +48,7 @@ void FilterNode::run(ExecutionNode* previous)
         }
 
         m_diceResult->setResultList(diceList2);
-        if(nullptr!=m_nextNode)
+        if(NULL!=m_nextNode)
         {
             m_nextNode->run(this);
         }
@@ -71,18 +71,20 @@ qint64 FilterNode::getPriority() const
     qint64 priority=0;
     if(nullptr!=m_previousNode)
     {
-        priority = m_previousNode->getPriority();
+        priority = m_nextNode->getPriority();
     }
+
+
     return priority;
 }
 ExecutionNode* FilterNode::getCopy() const
 {
     FilterNode* node = new FilterNode();
-    if(nullptr!=m_validator)
+    if(NULL!=m_validator)
     {
         node->setValidator(m_validator->getCopy());
     }
-    if(nullptr!=m_nextNode)
+    if(NULL!=m_nextNode)
     {
         node->setNextNode(m_nextNode->getCopy());
     }