From fb81611be9f888aec9b9eb454c533dab90bc015f Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Sun, 18 Mar 2018 17:47:33 +0100
Subject: -fix some priority nodes

---
 node/mergenode.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'node/mergenode.cpp')

diff --git a/node/mergenode.cpp b/node/mergenode.cpp
index e2d46cb..f808854 100644
--- a/node/mergenode.cpp
+++ b/node/mergenode.cpp
@@ -50,7 +50,7 @@ void MergeNode::run(ExecutionNode* previous)
                 DiceResult* dice = dynamic_cast<DiceResult*>(tmpResult);
                 if(nullptr!=dice)
                 {
-                    ///@todo improve here to set homogeneous while is really
+                    ///@todo TODO improve here to set homogeneous while is really
                     m_diceResult->setHomogeneous(false);
                     for(Die* die : dice->getResultList())
                     {
@@ -112,9 +112,9 @@ QString MergeNode::toString(bool withLabel) const
 qint64 MergeNode::getPriority() const
 {
     qint64 priority=0;
-    if(nullptr!=m_nextNode)
+    if(nullptr!=m_previousNode)
     {
-        priority = m_nextNode->getPriority();
+        priority = m_previousNode->getPriority();
     }
     return priority;
 }
@@ -126,7 +126,6 @@ ExecutionNode* MergeNode::getCopy() const
         node->setNextNode(m_nextNode->getCopy());
     }
     return node;
-
 }
 
 std::vector<ExecutionNode *>* MergeNode::getStartList() const
-- 
cgit v1.2.3-70-g09d2