Merge branch 'repeat2' into 'master'

All new features

See merge request kde/rolisteam-diceparser!4

1 files changed, 4 insertions, 7 deletions

diff --git a/node/mergenode.cpp b/node/mergenode.cpp
index 575613f..15f2fa7 100644
--- a/node/mergenode.cpp
+++ b/node/mergenode.cpp
@@ -40,25 +40,22 @@ void MergeNode::run(ExecutionNode* previous)
     for(auto start : *m_startList)
     {
         ExecutionNode* last= getLatestNode(start);
-        if(nullptr == last)
+        if(nullptr == last || nullptr == previousLast)
             continue;
 
         auto startResult= start->getResult();
         if(nullptr == startResult)
             continue;
 
-        if(nullptr != previousLast)
-        {
-            startResult->setPrevious(previousLast->getResult());
-            previousLast->setNextNode(start);
-        }
+        startResult->setPrevious(previousLast->getResult());
+        previousLast->setNextNode(start);
 
         previousLast= last;
         Result* tmpResult= last->getResult();
         while(nullptr != tmpResult)
         {
             DiceResult* dice= dynamic_cast<DiceResult*>(tmpResult);
-            if(nullptr != dice)
+            if(nullptr == dice)
             {
                 ///@todo TODO improve here to set homogeneous while is really
                 m_diceResult->setHomogeneous(false);