From d60520137c4f29d8bb5d7d58fb0a9cdbba3163b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Thu, 10 Sep 2020 08:01:24 +0200
Subject: [PATCH] ExprEngine: Refactoring

---
 lib/exprengine.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/exprengine.cpp b/lib/exprengine.cpp
index a624a124d..49ea76b4a 100644
--- a/lib/exprengine.cpp
+++ b/lib/exprengine.cpp
@@ -2000,13 +2000,12 @@ static ExprEngine::ValuePtr executeDot(const Token *tok, Data &data)
                 call(data.callbacks, tok->astOperand1(), data.getValue(tok->astOperand1()->varId(), nullptr, nullptr), &data);
             }
         }
-        if (!structValue) {
-            auto v = getValueRangeFromValueType(tok->valueType(), data);
-            if (!v)
-                v = std::make_shared<ExprEngine::BailoutValue>();
-            call(data.callbacks, tok, v, &data);
-            return v;
-        }
+
+        auto v = getValueRangeFromValueType(tok->valueType(), data);
+        if (!v)
+            v = std::make_shared<ExprEngine::BailoutValue>();
+        call(data.callbacks, tok, v, &data);
+        return v;
     }
     call(data.callbacks, tok->astOperand1(), structValue, &data);
     ExprEngine::ValuePtr memberValue = structValue->getValueOfMember(tok->astOperand2()->str());