* Fixed wrong rows executed in loops after gosub or goto.

eric-xs · Jun 10, 2016 · 2c59fc9 · 2c59fc9
1 parent 16fe05e
commit 2c59fc9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Documentation/About.md b/Documentation/About.md
@@ -37,6 +37,7 @@ Thiago Talma for some improvements to the code, debugging and many suggestions.
 
 ## Version 5.0.3
 
+* Fixed wrong rows executed in loops after gosub or goto.
 * Fixed missing value field in exported `Control` and `ControlGet` commands.
 * Fixed hidden *Main Loop* band reappearing after gui resize or minimizing/maximizing.
 * Fixed bug in *Copy to...* feature.

diff --git a/Documentation/MacroCreator_Help-doc/CompileCHM.ahk b/Documentation/MacroCreator_Help-doc/CompileCHM.ahk
@@ -6,11 +6,11 @@ File := A_ScriptDir "\index.html"
 FileRead, FileData, %File%
 PMCVer := RegExReplace(FileData, "s).*Version: ([\d\.]+).*", "$1")
 Data := "<a href=""http://www.macrocreator.com/""><img src=""Images/PMC.png"" alt=""Pulover's Macro Creator"" border=""0""></a>"
-FileMod_Change(FileData, Data, 10)
-Data := "<h1 id=""version:-" PMCVer """>Version: <a href=""About.html#change-log"">" PMCVer "</a></h1>"
 FileMod_Change(FileData, Data, 11)
+Data := "<h1 id=""version:-" PMCVer """>Version: <a href=""About.html#change-log"">" PMCVer "</a></h1>"
+FileMod_Change(FileData, Data, 12)
 Data := "<Version: " PMCVer ">`n</head>"
-FileMod_Change(FileData, Data, 8)
+FileMod_Change(FileData, Data, 9)
 FileDelete, %File%
 FileAppend, %FileData%, %File%
 

diff --git a/LIB/Playback.ahk b/LIB/Playback.ahk
@@ -485,7 +485,7 @@
 				,	CheckVars(PlaybackVars[LoopDepth][mLoopIndex], TimesX)
 				,	LoopDepth++
 				,	PlaybackVars[LoopDepth] := []
-				,	iLoopIndex++, StartMark[LoopDepth] := A_Index
+				,	iLoopIndex++, StartMark[LoopDepth] := mListRow
 				,	PlaybackVars[LoopDepth][mLoopIndex, "A_Index"] := 1
 				,	PlaybackVars[LoopDepth][mLoopIndex, "ErrorLevel"] := FlowControl.ErrorLevel
 				,	LoopCount[LoopDepth] := ""
@@ -608,7 +608,7 @@
 					_Count := LoopCount[LoopDepth][1]
 				,	LoopInfo := {LoopDepth: LoopDepth
 							,	PlaybackVars: PlaybackVars
-							,	Range: {Start: StartMark[LoopDepth], End: A_Index}
+							,	Range: {Start: StartMark[LoopDepth], End: mListRow }
 							,	Count: _Count + 1
 							,	CoordModes: PbCoordModes
 							,	SendModes: PbSendModes

diff --git a/MacroCreator.ahk b/MacroCreator.ahk
@@ -4012,7 +4012,6 @@ Gui, 34:Font
 Gui, 34:Font,, Tahoma
 Gui, 34:Add, Link,, <a href="http://www.macrocreator.com">www.macrocreator.com</a>
 Gui, 34:Add, Text,, Author: Pulover [Rodolfo U. Batista]
-Gui, 34:Add, Link, y+0, <a href="mailto:pulover@macrocreator.com">pulover@macrocreator.com</a>
 Gui, 34:Add, Text, -Wrap R1 y+0,
 (
 Copyright © 2012-2016 Rodolfo U. Batista