From df62d65d5ce3772f94df41c5b3ee0e0c304bbe40 Mon Sep 17 00:00:00 2001
From: ccremers <ccremers@4f7d145f-a0d4-0310-ae10-d96cc04433c1>
Date: Mon, 29 Jan 2007 15:17:11 +0000
Subject: [PATCH] - Fixes to error output

---
 gui/Gui/Scytherthread.py      |   9 ++++++++-
 gui/Scyther/Bin/scyther-linux | Bin 990749 -> 990749 bytes
 src/compiler.c                |   2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gui/Gui/Scytherthread.py b/gui/Gui/Scytherthread.py
index d3272ea..d83e5c2 100644
--- a/gui/Gui/Scytherthread.py
+++ b/gui/Gui/Scytherthread.py
@@ -254,7 +254,14 @@ class ErrorWindow(wx.Dialog):
         line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL)
         sizer.Add(line, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.RIGHT|wx.TOP, 5)
 
-        label = wx.StaticText(self, -1, "\n".join(errors))
+        etxt = ""
+        prefix = "error: "
+        for er in errors:
+            if er.startswith(prefix):
+                er = er[len(prefix):]
+            etxt = etxt + "%s\n" % (er)
+
+        label = wx.StaticText(self, -1, etxt)
         sizer.Add(label, 0, wx.ALIGN_LEFT|wx.ALL, 5)
 
         line = wx.StaticLine(self, -1, size=(20,-1), style=wx.LI_HORIZONTAL)
diff --git a/gui/Scyther/Bin/scyther-linux b/gui/Scyther/Bin/scyther-linux
index 0547a4246faac88ca498b746878705ec2a8f489f..39cbf63f181f73a6ba27dd7117f996d675c0b55b 100755
GIT binary patch
delta 102
zcmbQc$7b#xn+>AVg<f#kF)%F5Q0L=le!;jHOsh|CSD(%Z#7scU48$xz%nHP8+tsJD
rFEn5@Yd?9M9f&!Am=lP(wx2xC9r%SQ@<qGM9v&d(-7d3-k1+`Vp~5F>

delta 102
zcmbQc$7b#xn+>AVg%)P0^Kmr4U|bBMU;MRYU}#pK-mX5K5r~<9m>Gy!fS47C*|w`s
sXJ2T*Xxe`AI6Dw?05K;Jb8SC)oICIf)5(f<nLRu}%)4D?4<BO^0Pr~|TL1t6

diff --git a/src/compiler.c b/src/compiler.c
index ef42bb5..8d50d66 100644
--- a/src/compiler.c
+++ b/src/compiler.c
@@ -1976,8 +1976,8 @@ checkLabelMatchThis (const System sys, const Protocol p, const Role readrole,
 		      eprintf ("error: \t");
 		      roledefPrint (readevent);
 		      eprintf ("\n");
-		      globalError--;
 		      error_die ();
+		      globalError--;
 		    }
 		  else
 		    {