Fix parsing of macros that contain NN as well as other commands #752
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If a macro contains an
NN
command as well as others, since 26c29e1, that macro would be parsed as null byRDMacroEvent::load
.This PR ignores any null commands within a macro (is that the right behaviour or should they be preserved?), but tracks whether the macro contains only null commands. If so, it clears and returns false as before. Where the macro contains other commands as well as the
NN
, the other commands are loaded correctly, and only theNN
is ignored.To reproduce:
RDLibrary
PN 1!
NN !
(the default value if you double-click--- End of cart ---
and click OK)Expected behaviour: at least
PN 1!
is still visible; executing macro works.Behaviour in v3.6.2: no lines (except
--- End of cart---
) are visible, and macro will not execute.