From 96b36567423b552e2e6d62ebdd6d0df27abe2b2a Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sun, 9 Dec 2012 15:44:03 -0800 Subject: [PATCH] Stick to the standard order of sections when inserting lines --- aegisub/src/ass_entry.cpp | 4 ++-- aegisub/src/ass_entry.h | 2 +- aegisub/src/ass_file.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aegisub/src/ass_entry.cpp b/aegisub/src/ass_entry.cpp index 8eb684594..fd3f6f334 100644 --- a/aegisub/src/ass_entry.cpp +++ b/aegisub/src/ass_entry.cpp @@ -26,19 +26,19 @@ wxString const& AssEntry::GroupHeader(bool ssa) const { static wxString ass_headers[] = { "[Script Info]", - "[Events]", "[V4+ Styles]", "[Fonts]", "[Graphics]", + "[Events]", "" }; static wxString ssa_headers[] = { "[Script Info]", - "[Events]", "[V4 Styles]", "[Fonts]", "[Graphics]", + "[Events]", "" }; diff --git a/aegisub/src/ass_entry.h b/aegisub/src/ass_entry.h index a24c045d9..8454c184d 100644 --- a/aegisub/src/ass_entry.h +++ b/aegisub/src/ass_entry.h @@ -40,10 +40,10 @@ enum AssEntryGroup { ENTRY_INFO = 0, - ENTRY_DIALOGUE, ENTRY_STYLE, ENTRY_FONT, ENTRY_GRAPHIC, + ENTRY_DIALOGUE, ENTRY_GROUP_MAX }; diff --git a/aegisub/src/ass_file.cpp b/aegisub/src/ass_file.cpp index 2ba29a9cc..1cf2a9b92 100644 --- a/aegisub/src/ass_file.cpp +++ b/aegisub/src/ass_file.cpp @@ -274,13 +274,13 @@ void AssFile::InsertLine(AssEntry *entry) { entryIter it = Line.end(); do { --it; - if (it->Group() == entry->Group()) { + if (it->Group() <= entry->Group()) { Line.insert(++it, *entry); return; } } while (it != Line.begin()); - Line.push_back(*entry); + Line.push_front(*entry); } void AssFile::InsertAttachment(wxString filename) {