Fix regression

4 files changed, 17 insertions, 17 deletions

diff --git a/node/keepdiceexecnode.cpp b/node/keepdiceexecnode.cpp
index 8748a3b..3e4490d 100644
--- a/node/keepdiceexecnode.cpp
+++ b/node/keepdiceexecnode.cpp
@@ -93,19 +93,19 @@ void KeepDiceExecNode::run(ExecutionNode* previous)
 
 void KeepDiceExecNode::setDiceKeepNumber(ExecutionNode* n)
 {
-    m_numberOfDiceNode = n;
+    m_numberOfDiceNode= n;
 }
 QString KeepDiceExecNode::toString(bool wl) const
 {
-	if(wl)
-	{
-        auto param = m_numberOfDiceNode->toString(wl);
-        return QString("%1 [label=\"KeepDiceExecNode %2\"]").arg(m_id, param);
-	}
-	else
-	{
-		return m_id;
-	}
+    if(wl)
+    {
+        // auto param= m_numberOfDiceNode->toString(wl);
+        return QString("%1 [label=\"KeepDiceExecNode\"]").arg(m_id);
+    }
+    else
+    {
+        return m_id;
+    }
 }
 qint64 KeepDiceExecNode::getPriority() const
 {
diff --git a/node/sortresult.cpp b/node/sortresult.cpp
index 631949a..5d514cf 100644
--- a/node/sortresult.cpp
+++ b/node/sortresult.cpp
@@ -22,21 +22,20 @@
 #include "sortresult.h"
 
 #include "die.h"
-#include <QDebug>
 
 SortResultNode::SortResultNode() : m_diceResult(new DiceResult)
 {
     m_ascending= true;
     m_result= m_diceResult;
 }
-void SortResultNode::run(ExecutionNode* node)
+void SortResultNode::run(ExecutionNode* previous)
 {
-    m_previousNode= node;
-    if(nullptr == node)
+    m_previousNode= previous;
+    if(nullptr == previous)
     {
         return;
     }
-    DiceResult* previousDiceResult= dynamic_cast<DiceResult*>(node->getResult());
+    DiceResult* previousDiceResult= dynamic_cast<DiceResult*>(previous->getResult());
     m_diceResult->setPrevious(previousDiceResult);
     if(nullptr == previousDiceResult)
         return;
diff --git a/node/variablenode.cpp b/node/variablenode.cpp
index 416be86..0cd1733 100644
--- a/node/variablenode.cpp
+++ b/node/variablenode.cpp
@@ -1,5 +1,6 @@
 #include "variablenode.h"
 #include "parsingtoolbox.h"
+
 VariableNode::VariableNode() {}
 
 void VariableNode::run(ExecutionNode* previous)
@@ -16,7 +17,7 @@ void VariableNode::run(ExecutionNode* previous)
         if(!result)
             return;
 
-        auto copy= result->getCopy();
+        m_result= result->getCopy();
         auto diceResult= dynamic_cast<DiceResult*>(result);
         if(nullptr == diceResult)
             return;
@@ -26,7 +27,6 @@ void VariableNode::run(ExecutionNode* previous)
             die->setDisplayed(false);
         }
 
-        m_result= copy;
         if(nullptr != m_nextNode)
         {
             m_nextNode->run(this);
diff --git a/tests/dice/tst_dice.cpp b/tests/dice/tst_dice.cpp
index 150dddb..c5131ed 100644
--- a/tests/dice/tst_dice.cpp
+++ b/tests/dice/tst_dice.cpp
@@ -391,6 +391,7 @@ void TestDice::commandsTest_data()
     QTest::addRow("cmd89") << "1L[-3,-2,2,3]+10";
     QTest::addRow("cmd90") << "1L[-3,-2,2,3]+10;1L[-3,-2,2,3]";
     QTest::addRow("cmd91") << "1d20|3i:[>1]{\"Success\"}{\"Failure\"}";
+    QTest::addRow("cmd92") << "4d10k3;4d10k3;4d10k3;[$1,$2,$3]s;\"Score @4\"";
 }
 
 void TestDice::rangedCommandsTest()