diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof
index 19a3f49f..10d04fc7 100755
--- a/editor/studio/AMXX_Studio.dof
+++ b/editor/studio/AMXX_Studio.dof
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=2
 Release=0
-Build=3
+Build=4
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=AMX Mod X Dev Team
 FileDescription=
-FileVersion=1.2.0.3
+FileVersion=1.2.0.4
 InternalName=
 LegalCopyright=
 LegalTrademarks=
diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe
index 5e67fdee..050ad7b3 100755
Binary files a/editor/studio/AMXX_Studio.exe and b/editor/studio/AMXX_Studio.exe differ
diff --git a/editor/studio/AMXX_Studio.res b/editor/studio/AMXX_Studio.res
index 96f90916..ac6ccc60 100755
Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ
diff --git a/editor/studio/UnitCodeUtils.pas b/editor/studio/UnitCodeUtils.pas
index 98568f8a..f341bd7e 100755
--- a/editor/studio/UnitCodeUtils.pas
+++ b/editor/studio/UnitCodeUtils.pas
@@ -122,6 +122,7 @@ begin
   eIdent := 0;
   eTempIdent := 0;
 
+  Cancel := False;
   ShowProgress(False);
   frmMain.pbLoading.Max := frmMain.sciEditor.Lines.Count *2 -2;
   for i := 0 to frmMain.sciEditor.Lines.Count -1 do begin
@@ -227,6 +228,7 @@ var i: integer;
 begin
   Screen.Cursor := crHourGlass;
   frmMain.sciEditor.Enabled := False;
+  Cancel := False;
   ShowProgress(False);
   frmMain.pbLoading.Max := frmMain.sciEditor.Lines.Count -1;
 
@@ -291,7 +293,7 @@ end;
 function Between(eText, eFirst, eSecond: String): String;
 var eTemp: String;
 begin
-  if (Pos(eFirst, eText) = 0) and (Pos(eSecond, eText) = 0) then
+  if (Pos(eFirst, eText) = 0) or (Pos(eSecond, eText) = 0) then
     Result := ''
   else begin
     eTemp := eText;
diff --git a/editor/studio/UnitMainTools.pas b/editor/studio/UnitMainTools.pas
index c0559952..cb4dd48c 100755
--- a/editor/studio/UnitMainTools.pas
+++ b/editor/studio/UnitMainTools.pas
@@ -808,6 +808,7 @@ begin
   end;
 
   Result := True;
+  Cancel := False;
 
   ShowProgress(True);
   try
@@ -1080,6 +1081,7 @@ begin
   end;
 
   Screen.Cursor := crHourGlass;
+  Cancel := False;
   ShowProgress(True);
 
   AssignFile(F, AFilename);