From f8eb99bb18e4486a9946b8d56c3a51faca3bd3b0 Mon Sep 17 00:00:00 2001 From: James Crook Date: Wed, 26 Feb 2020 10:50:26 +0000 Subject: [PATCH] Bug 2341 - Macros prompt for save changes even with canceled edits --- src/BatchProcessDialog.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp index 3eb41d99e..49d130392 100644 --- a/src/BatchProcessDialog.cpp +++ b/src/BatchProcessDialog.cpp @@ -1112,14 +1112,18 @@ void MacrosWindow::OnEditCommandParams(wxCommandEvent & WXUNUSED(event)) // Just edit the parameters, and not the command. auto command = mMacroCommands.GetCommand(item); wxString params = mMacroCommands.GetParams(item); + wxString oldParams = params; params = MacroCommands::PromptForParamsFor(command, params, *this).Trim(); Raise(); + if (oldParams == params) + return; // They did not actually make any changes.. + mMacroCommands.DeleteFromMacro(item); mMacroCommands.AddToMacro(command, - params, - item); + params, + item); mChanged = true; mSelectedCommand = item; PopulateList();