Skip to content

Commit

Permalink
* Fixed bug in expressions when assigning a variable to a ternary ope…
Browse files Browse the repository at this point in the history
…ration.
  • Loading branch information
Pulover committed Aug 7, 2016
1 parent 786c813 commit 326f607
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 11 deletions.
10 changes: 7 additions & 3 deletions Documentation/About.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
Author: Pulover \[Rodolfo U. Batista\]
Copyright © 2012-2016 Rodolfo U. Batista

Version: 5.0.4
Release Date: July, 2016
AutoHotkey Version: 1.1.24.00
Version: 5.0.5
Release Date: August, 2016
AutoHotkey Version: 1.1.24.01

Software License: [GNU General Public License](License.html)

Expand All @@ -35,6 +35,10 @@ Thiago Talma for some improvements to the code, debugging and many suggestions.

# Change Log

## Version 5.0.5

* Fixed bug in expressions when assigning a variable to a ternary operation.

## Version 5.0.4

* Fixed wrong options set for *Message Box* when editing the command.
Expand Down
5 changes: 5 additions & 0 deletions Documentation/Faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* [Can I run a Macro in a background window?](#can-i-run-a-macro-in-a-background-window)
* [Can I schedule a Macro to run when I want?](#can-i-schedule-a-macro-to-run-when-i-want)
* [How do I increment/add a value in a variable on every loop iteration?](#how-do-i-increment/add-a-value-in-a-variable-on-every-loop-iteration)
* [How can I make an exported script auto-execute without a hotkey?](#how-can-i-make-an-exported-script-auto-execute-without-a-hotkey)
* [Is Macro Creator Portable?](#is-macro-creator-portable)
* [Which command line parameters are supported?](#which-command-line-parameters-are-supported)

This comment has been minimized.

Copy link
@hitvery

hitvery Dec 17, 2016

The link about supported command line is invalid, please fix it. I found them in previous version, took hard effort...

* [Can I execute an action every time a certain event occurs?](#can-i-execute-an-action-every-time-a-certain-event-occurs)
Expand Down Expand Up @@ -113,6 +114,10 @@ The code below is a PMC file (you can copy and save it using any text editor).
A_Index is only valid inside a Loop, but in PMC all macros are considered loops since you can set the number of repetitions for the whole macro.

### How can I make an exported script auto-execute without a hotkey?

To make the first macro auto-execute when running an exported script, remove the hotkey associated with it in the [Export Window](Export.html) "Macros" section.

### Is Macro Creator Portable?

All settings are saved to *MacroCreator.ini* and User Global Variables are saved to *UserGlobalVars.ini*, both files are located inside *AppData\MacroCreator* by default. To make **Macro Creator** portable you can copy those files to the same directory of *MacroCreator.exe* and it will use its own folder instead of AppData.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/MacroCreator_Help.ahk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
Library: Pulover's Macro Creator
# Version: 5.0.4
# Version: 5.0.5
[www.macrocreator.com](http://www.macrocreator.com)
[Forum Thread](http://autohotkey.com/boards/viewtopic.php?f=6&t=143)
Expand Down
2 changes: 1 addition & 1 deletion LIB/Eval.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Eval($x, _CustomVars := "", _Init := true)
For $i, $v in $z
{
; Check for Ternary expression and evaluate
If (RegExMatch($z[$i], "([^\?:]+?)\?([^\?:]+?):(.*)", _Match))
If (RegExMatch($z[$i], "([^\?:=]+?)\?([^\?:]+?):(.*)", _Match))
{
Loop, 3
{
Expand Down
10 changes: 5 additions & 5 deletions MacroCreator.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
; Author: Pulover [Rodolfo U. Batista]
; Home: http://www.macrocreator.com
; Forum: http://autohotkey.com/boards/viewtopic.php?f=6&t=143
; Version: 5.0.4
; Release Date: July, 2016
; AutoHotkey Version: 1.1.24.00
; Version: 5.0.5
; Release Date: August, 2016
; AutoHotkey Version: 1.1.24.01
; Copyright © 2012-2016 Rodolfo U. Batista
; GNU General Public License 3.0 or higher
; <http://www.gnu.org/licenses/gpl-3.0.txt>
Expand Down Expand Up @@ -66,7 +66,7 @@ http://www.macrocreator.com/project/
; Compiler Settings
;@Ahk2Exe-SetName Pulover's Macro Creator
;@Ahk2Exe-SetDescription Pulover's Macro Creator
;@Ahk2Exe-SetVersion 5.0.4
;@Ahk2Exe-SetVersion 5.0.5
;@Ahk2Exe-SetCopyright Copyright © 2012-2016 Rodolfo U. Batista
;@Ahk2Exe-SetOrigFilename MacroCreator.exe

Expand Down Expand Up @@ -128,7 +128,7 @@ Loop
}


CurrentVersion := "5.0.4", ReleaseDate := "July, 2016"
CurrentVersion := "5.0.5", ReleaseDate := "August, 2016"

;##### Ini File Read #####

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Pulover's Macro Creator is a Free Automation Tool and Script Generator based on

[www.macrocreator.com](http://www.macrocreator.com)

**Current Version:** 5.0.4
**Current Version:** 5.0.5

### Supported platforms

Expand Down

0 comments on commit 326f607

Please sign in to comment.