From 591fbbd71b10a5f086fab622f7dfe43f3a8adcb6 Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Wed, 1 Jul 2020 00:00:27 +0200
Subject: Fix some behaviours about

---
 diceparser.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'diceparser.cpp')

diff --git a/diceparser.cpp b/diceparser.cpp
index 5c0590c..7adf610 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -368,11 +368,12 @@ bool DiceParser::hasResultOfType(Dice::RESULT_TYPE type, ExecutionNode* node, QV
     bool scalarDone= false;
     ExecutionNode* next= ParsingToolBox::getLeafNode(node);
     Result* result= next->getResult();
+    int i= 0;
     while((result != nullptr) && (!scalarDone))
     {
         bool lastResult= false;
         if(notthelast)
-            lastResult= (nullptr == result->getPrevious());
+            lastResult= (nullptr == result->getPrevious() && i != 0);
 
         if(result->hasResultOfType(type) && !lastResult)
         {
@@ -380,6 +381,7 @@ bool DiceParser::hasResultOfType(Dice::RESULT_TYPE type, ExecutionNode* node, QV
             value= result->getResult(type);
         }
         result= result->getPrevious();
+        ++i;
     }
     return scalarDone;
 }
-- 
cgit v1.2.3-70-g09d2