From bd259b7197e94552adf4dcca3957c28157009e6e Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 20 Nov 2012 14:28:24 -0800 Subject: [PATCH] Fix awesome variable shadowing derp --- aegisub/src/command/edit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aegisub/src/command/edit.cpp b/aegisub/src/command/edit.cpp index 4b02bce32..96d5cb303 100644 --- a/aegisub/src/command/edit.cpp +++ b/aegisub/src/command/edit.cpp @@ -166,10 +166,10 @@ void paste_lines(agi::Context *c, bool paste_over) { } template -T get_value(AssDialogue const& line, int blockn, T initial, wxString const& tag, wxString alt = wxString()) { +T get_value(AssDialogue const& line, int blockn, T initial, wxString const& tag_name, wxString alt = wxString()) { for (auto ovr : line.Blocks | boost::adaptors::reversed | agi::of_type()) { for (auto tag : ovr->Tags | boost::adaptors::reversed) { - if (tag->Name == tag || tag->Name == alt) + if (tag->Name == tag_name || tag->Name == alt) return tag->Params[0]->Get(initial); } }