From 97ab539d0fd2128d90af3659802834dbcf66e726 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Fri, 11 Sep 2020 00:11:53 +0200
Subject: [PATCH] + cln: TinyExpr code cleanup

---
 src/Notepad3.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Notepad3.c b/src/Notepad3.c
index 90a9d823e..18882459a 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -2060,18 +2060,20 @@ static bool _HandleTinyExpr(bool qmark)
       while (IsBlankChar(*pBegin)) { ++pBegin; }       
 
       double dExprEval = 0.0;
-      te_xint_t iExprErr = 1;
-      while (*pBegin && iExprErr) {
-        dExprEval = te_interp(pBegin++, &iExprErr);
+      te_xint_t exprErr = 1;
+      while (*pBegin && exprErr) {
+        dExprEval = te_interp(pBegin++, &exprErr);
       }
-      if (*pBegin && !iExprErr) {
+      if (!*pBegin) { exprErr = 1; }
+      FreeMem(lineBuf);
+
+      if (!exprErr) {
         char chExpr[64] = { '\0' };
         StringCchPrintfA(chExpr, COUNTOF(chExpr), "%.6G", dExprEval);
         SciCall_SetSel(posBegin, posCur);
         SciCall_ReplaceSel(chExpr);
+        return true;
       }
-      FreeMem(lineBuf);
-      return true;
     }
   }
   return false;