From acd850dd855c47c36e0a1b1b67670148e2a4a4db Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 6 Sep 2003 19:48:00 +0000
Subject: [PATCH] !ifdef, again...

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2861 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/script.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Source/script.cpp b/Source/script.cpp
index aa101379..07937c1a 100644
--- a/Source/script.cpp
+++ b/Source/script.cpp
@@ -325,6 +325,12 @@ parse_again:
       return PS_ERROR;
     }
 
+    if (cur_ifblock->hasexeced)
+    {
+      cur_ifblock->ignore++;
+      return PS_OK;
+    }
+
     if (line.getnumtokens() == 1)
     {
       cur_ifblock->ignore = !cur_ifblock->ignore;
@@ -334,12 +340,6 @@ parse_again:
       return PS_OK;
     }
 
-    if (cur_ifblock->hasexeced)
-    {
-      cur_ifblock->ignore++;
-      return PS_OK;
-    }
-
     line.eattoken();
 
     int v=line.gettoken_enum(0,"ifdef\0ifndef\0");
@@ -348,8 +348,6 @@ parse_again:
     if (!v) tkid = TOK_P_IFDEF;
     else tkid = TOK_P_IFNDEF;
     if_from_else++;
-
-    SCRIPT_MSG("!else on line %d - %s\n", linecnt, line.gettoken_str(0));
   }
 
   if (tkid == TOK_P_IFNDEF || tkid == TOK_P_IFDEF)