From 732b9b25b6f679ea6c6a5544998cb315d19c43cb Mon Sep 17 00:00:00 2001
From: "Rodolfo U. Batista" <rodolfoub@gmail.com>
Date: Wed, 28 Oct 2020 00:09:38 -0300
Subject: [PATCH] * Fixed bug in Function Return.

---
 Documentation/About.md              | 5 ++++-
 Documentation/MacroCreator_Help.ahk | 2 +-
 LIB/Playback.ahk                    | 4 ++--
 MacroCreator.ahk                    | 8 ++++----
 README.md                           | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Documentation/About.md b/Documentation/About.md
index b2d8d414..8e9f0e52 100644
--- a/Documentation/About.md
+++ b/Documentation/About.md
@@ -7,7 +7,7 @@
 Author: Pulover \[Rodolfo U. Batista\]  
 Copyright © 2012-2020 Rodolfo U. Batista  
 
-Version: 5.3.1  
+Version: 5.3.2  
 Release Date: October, 2020  
 AutoHotkey Version: 1.1.32.00  
 
@@ -37,6 +37,9 @@ chosen1ft for fixing the mixing rows bug when saving a project.
 
 # Change Log
 
+## Version 5.3.2
+* Fixed bug in Function Return.
+
 ## Version 5.3.1
 * Added **Random coordinates** option in *Mouse* command window.
 * Added **Custom icon** option for exported EXE in *Export* window.
diff --git a/Documentation/MacroCreator_Help.ahk b/Documentation/MacroCreator_Help.ahk
index 39476a2b..3a957686 100644
--- a/Documentation/MacroCreator_Help.ahk
+++ b/Documentation/MacroCreator_Help.ahk
@@ -1,7 +1,7 @@
 /*!
 	Library: Pulover's Macro Creator
 		
-		# Version: 5.3.1
+		# Version: 5.3.2
 		[www.macrocreator.com](https://www.macrocreator.com)  
 		[Forum](https://www.autohotkey.com/boards/viewforum.php?f=63)
 		
diff --git a/LIB/Playback.ahk b/LIB/Playback.ahk
index 84ced027..2e90d311 100644
--- a/LIB/Playback.ahk
+++ b/LIB/Playback.ahk
@@ -309,8 +309,8 @@
 				For _each, _value in SVRef
 				{
 					If (Static_Vars[RunningFunction].HasKey(_each))
-						Static_Vars[RunningFunction][_each] := %_each%
-					%_each% := _value
+						Try Static_Vars[RunningFunction][_each] := %_each%
+					Try %_each% := _value
 				}
 				
 				For _each, _value in ScopedParams
diff --git a/MacroCreator.ahk b/MacroCreator.ahk
index add9c7d6..309d4d1a 100644
--- a/MacroCreator.ahk
+++ b/MacroCreator.ahk
@@ -5,7 +5,7 @@
 ; Author: Pulover [Rodolfo U. Batista]
 ; Home: https://www.macrocreator.com
 ; Forum: https://www.autohotkey.com/boards/viewforum.php?f=63
-; Version: 5.3.1
+; Version: 5.3.2
 ; Release Date: October, 2020
 ; AutoHotkey Version: 1.1.32.00
 ; Copyright © 2012-2020 Rodolfo U. Batista
@@ -74,7 +74,7 @@ https://www.macrocreator.com/project/
 ; Compiler Settings
 ;@Ahk2Exe-SetName Pulover's Macro Creator
 ;@Ahk2Exe-SetDescription Pulover's Macro Creator
-;@Ahk2Exe-SetVersion 5.3.1
+;@Ahk2Exe-SetVersion 5.3.2
 ;@Ahk2Exe-SetCopyright Copyright © 2012-2020 Rodolfo U. Batista
 ;@Ahk2Exe-SetOrigFilename MacroCreator.exe
 
@@ -141,7 +141,7 @@ Loop
 		break
 }
 
-CurrentVersion := "5.3.1", ReleaseDate := "October, 2020"
+CurrentVersion := "5.3.2", ReleaseDate := "October, 2020"
 
 ;##### Ini File Read #####
 
@@ -715,7 +715,7 @@ If (KeepDefKeys = 1)
 
 GoSub, LoadLang
 
-If (InStr(FileLayout, "(Ctrl+G)"))
+If (RegExMatch(FileLayout, "\(Ctrl\s*\+\s*G\)"))
 	FileLayout := RegExReplace(FileLayout, "=\w+\s*\(Ctrl\s*\+\s*G\)", "=" w_Lang046)
 
 #Include <Definitions>
diff --git a/README.md b/README.md
index a592ecbf..b0efa7c9 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Pulover's Macro Creator is a Free Automation Tool and Script Generator based on
 
 [www.macrocreator.com](https://www.macrocreator.com)
 
-**Current Version:** 5.3.1
+**Current Version:** 5.3.2
 
 ### Supported platforms