diff options
| author |   Renaud G <renaud@rolisteam.org> | 2016-10-10 20:41:11 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2016-10-10 20:41:11 +0200 |
| commit | 24b0acebcbb351e77bb11daf85b4bb3984a03ab8 (patch) | |
| tree | 5da4a24039e7c6d7e8d17861ddd9f3857b3f193a /node | |
| parent | 33429179caa08414646f7f6c9d396b070de9bdff (diff) | |
| parent | 6dba1839f580b34980c33b2aaeb7a90dfb27fe3b (diff) | |
| download | OneRoll-24b0acebcbb351e77bb11daf85b4bb3984a03ab8.tar.gz OneRoll-24b0acebcbb351e77bb11daf85b4bb3984a03ab8.zip | |
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'node')
| -rw-r--r-- | node/paintnode.cpp | 2 | ||||
| -rw-r--r-- | node/sortresult.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/node/paintnode.cpp b/node/paintnode.cpp index ad13c52..02a9358 100644 --- a/node/paintnode.cpp +++ b/node/paintnode.cpp @@ -97,7 +97,7 @@ void PainterNode::run(ExecutionNode* previous) } Result* PainterNode::getResult() { - m_previousNode->getResult(); + return m_previousNode->getResult(); } QString PainterNode::toString(bool wl) const diff --git a/node/sortresult.cpp b/node/sortresult.cpp index 0bf531c..f72d884 100644 --- a/node/sortresult.cpp +++ b/node/sortresult.cpp @@ -96,7 +96,7 @@ void SortResultNode::run(ExecutionNode* node) } else { - m_result = node->getResult(); + //m_result = node->getResult(); //m_errors.append(DIE_RESULT_EXPECTED); } |