From 4204b5aee536a39cc91833bf11f49f06735f13d1 Mon Sep 17 00:00:00 2001
From: tmcdos <none@none>
Date: Fri, 22 Jul 2016 20:22:54 +0300
Subject: [PATCH] Synchronize with C++ snapshot - 2 small fixes in Decompiler.

---
 Decompiler.pas |   7 +++----
 Idr.dof        |   4 ++--
 Idr.res        | Bin 8244 -> 8244 bytes
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Decompiler.pas b/Decompiler.pas
index af6e6bb..a96fdbb 100644
--- a/Decompiler.pas
+++ b/Decompiler.pas
@@ -7289,15 +7289,15 @@ function TDecompiler.DecompileTry(fromAdr:Integer; flags:TDecomCset; loopInfo:TL
     begin
       Env.Stack[item1.IntValue]._Type := 'Variant';
       item1 := Env.Stack[item1.IntValue];
-      CompInfo.L := item1.Name;
     end;
+    CompInfo.L := item1.Name;
     GetRegItem(18, item2); //edx - Right argument
     if IF_STACK_PTR in item2.Flags then
     begin
       Env.Stack[item2.IntValue]._Type := 'Variant';
       item2 := Env.Stack[item2.IntValue];
-      CompInfo.R := item2.Name;
     end;
+    CompInfo.R := item2.Name;
     Result:=true;
     Exit;
   end
@@ -7329,9 +7329,8 @@ function TDecompiler.DecompileTry(fromAdr:Integer; flags:TDecomCset; loopInfo:TL
       Env.Stack[item1.IntValue]._Type := 'Variant';
       item1 := Env.Stack[item1.IntValue];
     end;
-    line:=item1.Name + ' := Variant(' + FPop.Value + ')'; //FGet(0)
+    line:=item1.Name + ' := Variant(' + FPop.Value + ')';
     Env.AddToBody(line);
-    FPop;
     Exit;
   end
   else if SameText(name, '@VarFromReal') then
diff --git a/Idr.dof b/Idr.dof
index e883a02..0813c08 100644
--- a/Idr.dof
+++ b/Idr.dof
@@ -115,7 +115,7 @@ AutoIncBuild=0
 MajorVer=1
 MinorVer=1
 Release=0
-Build=1338
+Build=1339
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1251
 [Version Info Keys]
 CompanyName=
 FileDescription=
-FileVersion=1.1.0.1338
+FileVersion=1.1.0.1339
 InternalName=
 LegalCopyright=
 LegalTrademarks=
diff --git a/Idr.res b/Idr.res
index c9e0f016e59d1f04be391e7de651fd3e4332eaa8..c83e0dfc1be26ea872acbb6f3cec44a1072b4a10 100644
GIT binary patch
delta 28
icmdnuu*G4+8(B_kRt5$}Ahe$RRrW5U<>t$BiHrb*^$6+!

delta 28
icmdnuu*G4+8(B^(Rt5$}AheqNRrW5U#pcU$iHrb*&j{xL