mirror of
https://github.com/notepad-plus-plus/notepad-plus-plus.git
synced 2025-07-25 06:45:27 +02:00
Correctly identify when a macro is playing
In certain cases (e.g. running the current macro until the end of file) and auto-completion and auto-indentation was not getting turned off, causing certain commands to get interpreted incorrectly. Closes #2553, Closes #2545, Closes #2556
This commit is contained in:
parent
decc9645e1
commit
5af1c055d1
@ -45,6 +45,7 @@ void Notepad_plus::macroPlayback(Macro macro)
|
|||||||
{
|
{
|
||||||
LongRunningOperation op;
|
LongRunningOperation op;
|
||||||
|
|
||||||
|
_playingBackMacro = true;
|
||||||
_pEditView->execute(SCI_BEGINUNDOACTION);
|
_pEditView->execute(SCI_BEGINUNDOACTION);
|
||||||
|
|
||||||
for (Macro::iterator step = macro.begin(); step != macro.end(); ++step)
|
for (Macro::iterator step = macro.begin(); step != macro.end(); ++step)
|
||||||
@ -56,6 +57,7 @@ void Notepad_plus::macroPlayback(Macro macro)
|
|||||||
}
|
}
|
||||||
|
|
||||||
_pEditView->execute(SCI_ENDUNDOACTION);
|
_pEditView->execute(SCI_ENDUNDOACTION);
|
||||||
|
_playingBackMacro = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Notepad_plus::command(int id)
|
void Notepad_plus::command(int id)
|
||||||
@ -860,9 +862,7 @@ void Notepad_plus::command(int id)
|
|||||||
case IDM_MACRO_PLAYBACKRECORDEDMACRO:
|
case IDM_MACRO_PLAYBACKRECORDEDMACRO:
|
||||||
if (!_recordingMacro) // if we're not currently recording, then playback the recorded keystrokes
|
if (!_recordingMacro) // if we're not currently recording, then playback the recorded keystrokes
|
||||||
{
|
{
|
||||||
_playingBackMacro = true;
|
|
||||||
macroPlayback(_macro);
|
macroPlayback(_macro);
|
||||||
_playingBackMacro = false;
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user