iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix issues with the edit box buttons and omitted tag parameters 

Originally committed to SVN as r4795.
This commit is contained in:
Thomas Goyne 2010-10-08 06:06:44 +00:00
parent 8545446baa
commit 82ca2a4b70
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
aegisub/src/subs_edit_box.cpp
View File

@ -120,11 +120,11 @@ template<class T>
static T get_value(AssDialogue const& line, int blockn, T initial, wxString tag, wxString alt = "") { static T get_value(AssDialogue const& line, int blockn, T initial, wxString tag, wxString alt = "") {
for (int i = blockn; i >= 0; i--) { for (int i = blockn; i >= 0; i--) {
AssDialogueBlockOverride *ovr = dynamic_cast<AssDialogueBlockOverride*>(line.Blocks[i]); AssDialogueBlockOverride *ovr = dynamic_cast<AssDialogueBlockOverride*>(line.Blocks[i]);
if (ovr) { if (!ovr) continue;
for (int j = (int)ovr->Tags.size() - 1; j >= 0; j--) {
if (ovr->Tags[j]->Name == tag || ovr->Tags[j]->Name == alt) { for (int j = (int)ovr->Tags.size() - 1; j >= 0; j--) {
return ovr->Tags[j]->Params[0]->Get<T>(); if (ovr->Tags[j]->Name == tag || ovr->Tags[j]->Name == alt) {
} return ovr->Tags[j]->Params[0]->Get<T>(initial);
} }
} }
} }
@ -735,6 +735,7 @@ void SubsEditBox::SetTag(wxString tag, wxString value, bool atEnd) {
} }
else { else {
ovr->Tags[i]->Params[0]->Set(value); ovr->Tags[i]->Params[0]->Set(value);
ovr->Tags[i]->Params[0]->omitted = false;
found = true; found = true;
} }
} }