From 943c8c25641482a4c5301bb1327d391cc3a486bd Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Thu, 12 Apr 2007 15:02:05 +0000
Subject: [PATCH] Fixed karaoke mode + vector drawings crash

Originally committed to SVN as r1060.
---
 aegisub/audio_karaoke.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/aegisub/audio_karaoke.cpp b/aegisub/audio_karaoke.cpp
index 8d526d505..737caa3e0 100644
--- a/aegisub/audio_karaoke.cpp
+++ b/aegisub/audio_karaoke.cpp
@@ -231,8 +231,7 @@ bool AudioKaraoke::ParseDialogue(AssDialogue *curDiag) {
 	// Load syllable data
 	for (size_t i=0;i<n;i++) {
 		block = curDiag->Blocks.at(i);
-		override = AssDialogueBlock::GetAsOverride(block);
-		if (override) {
+		if (override = AssDialogueBlock::GetAsOverride(block)) {
 			AssOverrideTag *len = GetKaraokeLength(override);
 			if (len) {
 				if (foundOne) syllables.push_back(temp);
@@ -246,8 +245,7 @@ bool AudioKaraoke::ParseDialogue(AssDialogue *curDiag) {
 				temp.original_tagdata = len->Params.at(0);
 			}
 		}
-		else {
-			plain = AssDialogueBlock::GetAsPlain(block);
+		else if (plain = AssDialogueBlock::GetAsPlain(block)) {
 			temp.contents += plain->text;
 			if (plain->text != _T("")) foundOne = true;
 		}