From c1ed6670255beef6571af43fa6045563eb53e7fc Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Tue, 4 Dec 2012 19:49:05 -0800
Subject: [PATCH] Add the curly braces in AssDialogueBlockOverride::GetText

All of the calling code added them, so there's no reason not to just do
it in one place.
---
 aegisub/src/ass_dialogue.cpp       | 10 ++--------
 aegisub/src/ass_override.cpp       |  3 ++-
 aegisub/src/dialog_translation.cpp |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/aegisub/src/ass_dialogue.cpp b/aegisub/src/ass_dialogue.cpp
index 017e1477c..0d4b0dc84 100644
--- a/aegisub/src/ass_dialogue.cpp
+++ b/aegisub/src/ass_dialogue.cpp
@@ -289,14 +289,8 @@ void AssDialogue::StripTag(wxString const& tag_name) {
 void AssDialogue::UpdateText(boost::ptr_vector<AssDialogueBlock>& blocks) {
 	if (blocks.empty()) return;
 	Text.clear();
-	for (auto& block : blocks) {
-		if (block.GetType() == BLOCK_OVERRIDE) {
-			Text += "{";
-			Text += block.GetText();
-			Text += "}";
-		}
-		else Text += block.GetText();
-	}
+	for (auto& block : blocks)
+		Text += block.GetText();
 }
 
 void AssDialogue::SetMarginString(wxString const& origvalue, int which) {
diff --git a/aegisub/src/ass_override.cpp b/aegisub/src/ass_override.cpp
index 520550353..3509ea792 100644
--- a/aegisub/src/ass_override.cpp
+++ b/aegisub/src/ass_override.cpp
@@ -92,9 +92,10 @@ void AssDialogueBlockOverride::AddTag(wxString const& tag) {
 }
 
 wxString AssDialogueBlockOverride::GetText() {
-	text.clear();
+	text = "{";
 	for (auto tag : Tags)
 		text += *tag;
+	text += "}";
 	return text;
 }
 
diff --git a/aegisub/src/dialog_translation.cpp b/aegisub/src/dialog_translation.cpp
index e0fe1a56a..146f2541f 100644
--- a/aegisub/src/dialog_translation.cpp
+++ b/aegisub/src/dialog_translation.cpp
@@ -254,7 +254,7 @@ void DialogTranslation::UpdateDisplay() {
 			}
 		}
 		else if (block.GetType() == BLOCK_OVERRIDE)
-			original_text->AppendText("{" + block.GetText() + "}");
+			original_text->AppendText(block.GetText());
 		++i;
 	}