From 7bdcb03fbae126f5b36d92aa3f28d67be0d7986d Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Sat, 6 Jan 2007 03:40:58 +0000
Subject: [PATCH] Finished merging of SSA mode with standard mode and fixed
 auto-commit to work with it.

Originally committed to SVN as r720.
---
 aegisub/audio_box.cpp     |  2 +-
 aegisub/audio_display.cpp | 70 ++++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/aegisub/audio_box.cpp b/aegisub/audio_box.cpp
index 20f84527f..44f4f0663 100644
--- a/aegisub/audio_box.cpp
+++ b/aegisub/audio_box.cpp
@@ -495,7 +495,7 @@ void AudioBox::OnPlayToEnd(wxCommandEvent &event) {
 // Commit changes
 void AudioBox::OnCommit(wxCommandEvent &event) {
 	audioDisplay->SetFocus();
-	audioDisplay->CommitChanges();
+	audioDisplay->CommitChanges(true);
 }
 
 
diff --git a/aegisub/audio_display.cpp b/aegisub/audio_display.cpp
index 402ab32ab..f7021bdfa 100644
--- a/aegisub/audio_display.cpp
+++ b/aegisub/audio_display.cpp
@@ -1150,51 +1150,52 @@ void AudioDisplay::CommitChanges (bool nextLine) {
 	// Loaded?
 	if (!loaded) return;
 
+	// Check validity
+	bool wasKaraSplitting = false;
+	bool validCommit = true;
 	if (!box->audioKaraoke->splitting) {
-		// Check if there's any need to commit
-		if (!NeedCommit) return;
-
-		// Check if selection is valid
-		if (curEndMS < curStartMS) return;
+		if (!NeedCommit || curEndMS < curStartMS) validCommit = false;
 	}
 
-	// Reset flags
-	diagUpdated = false;
-	NeedCommit = false;
-
 	// Update karaoke
 	int karSyl = 0;
-	bool wasKaraSplitting = false;
 	if (karaoke->enabled) {
 		wasKaraSplitting = box->audioKaraoke->splitting;
 		karaoke->Commit();
 		karSyl = karaoke->curSyllable;
 	}
+	
+	// Commit ok?
+	if (validCommit) {
+		// Reset flags
+		diagUpdated = false;
+		NeedCommit = false;
 
-	// Update dialogues
-	blockUpdate = true;
-	wxArrayInt sel = grid->GetSelection();
-	int sels = (int)sel.Count();
-	AssDialogue *curDiag;
-	for (int i=-1;i<sels;i++) {
-		if (i == -1) curDiag = dialogue;
-		else {
-			curDiag = grid->GetDialogue(sel[i]);
-			if (curDiag == dialogue) continue;
+		// Update dialogues
+		blockUpdate = true;
+		wxArrayInt sel = grid->GetSelection();
+		int sels = (int)sel.Count();
+		AssDialogue *curDiag;
+		for (int i=-1;i<sels;i++) {
+			if (i == -1) curDiag = dialogue;
+			else {
+				curDiag = grid->GetDialogue(sel[i]);
+				if (curDiag == dialogue) continue;
+			}
+
+			curDiag->Start.SetMS(curStartMS);
+			curDiag->End.SetMS(curEndMS);
+			curDiag->UpdateData();
 		}
 
-		curDiag->Start.SetMS(curStartMS);
-		curDiag->End.SetMS(curEndMS);
-		curDiag->UpdateData();
+		// Update grid
+		grid->editBox->Update(!karaoke->enabled);
+		grid->ass->FlagAsModified();
+		grid->CommitChanges();
+		karaoke->curSyllable = karSyl;
+		blockUpdate = false;
 	}
 
-	// Update grid
-	grid->editBox->Update(!karaoke->enabled);
-	grid->ass->FlagAsModified();
-	grid->CommitChanges();
-	karaoke->curSyllable = karSyl;
-	blockUpdate = false;
-
 	// Next line
 	if (nextLine && Options.AsBool(_T("Audio Next Line on Commit")) && !wasKaraSplitting) {
 		// Insert a line if it doesn't exist
@@ -1599,12 +1600,13 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event) {
 		if (hold != 0) {
 			// Dragging
 			if (buttonIsDown) {
-				// Drag from nothing
+				// Drag from nothing or straight timing
 				if (hold == 3 && buttonIsDown) {
 					if (!karMode) {
 						if (leftIsDown) curStartMS = GetMSAtX(x);
 						else curEndMS = GetMSAtX(x);
 						updated = true;
+						diagUpdated = true;
 
 						if (x != lastX) {
 							selStart = x;
@@ -1834,13 +1836,13 @@ void AudioDisplay::OnKeyDown(wxKeyEvent &event) {
 
 	// Accept
 	if (Hotkeys.IsPressed(_T("Audio Commit"))) {
-		CommitChanges();
-		ChangeLine(1);
+		CommitChanges(true);
+		//ChangeLine(1);
 	}
 
 	// Accept (SSA's "Grab times")
 	if (Hotkeys.IsPressed(_T("Audio Commit Alt"))) {
-		CommitChanges();
+		CommitChanges(true);
 	}
 
 	// Accept (stay)