mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix #704 with a slightly dirty hack.

Browse source 
Originally committed to SVN as r2208.
This commit is contained in:
Niels Martin Hansen 2008-06-21 17:25:00 +00:00
parent f1c89cb4bc
commit 025869468b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
aegisub/audio_display.cpp
View file

@ -1212,6 +1212,7 @@ void AudioDisplay::CommitChanges (bool nextLine) {
blockUpdate = true; blockUpdate = true;
wxArrayInt sel = grid->GetSelection(); wxArrayInt sel = grid->GetSelection();
int sels = (int)sel.Count(); int sels = (int)sel.Count();
bool textNeedsCommit = grid->GetDialogue(sel[0])->Text != grid->editBox->TextEdit->GetText();
AssDialogue *curDiag; AssDialogue *curDiag;
for (int i=-1;i<sels;i++) { for (int i=-1;i<sels;i++) {
if (i == -1) curDiag = dialogue; if (i == -1) curDiag = dialogue;
@ -1222,7 +1223,7 @@ void AudioDisplay::CommitChanges (bool nextLine) {
curDiag->Start.SetMS(curStartMS); curDiag->Start.SetMS(curStartMS);
curDiag->End.SetMS(curEndMS); curDiag->End.SetMS(curEndMS);
if (!karaoke->enabled) { if (!karaoke->enabled && textNeedsCommit) {
// If user was editing karaoke stuff, that should take precedence of manual changes in the editbox, // If user was editing karaoke stuff, that should take precedence of manual changes in the editbox,
// so only update from editbox when not in kara mode // so only update from editbox when not in kara mode
curDiag->Text = grid->editBox->TextEdit->GetText(); curDiag->Text = grid->editBox->TextEdit->GetText();