From e0b6c8bf4799a7c62a09e768a789f8bf2fe0be88 Mon Sep 17 00:00:00 2001 From: harukalover Date: Fri, 9 Oct 2009 19:57:30 +0000 Subject: [PATCH] Merge r3668 into milestone:2.1.8. Closes #1003. Originally committed to SVN as r3670. --- aegisub/src/dialog_jumpto.cpp | 2 +- aegisub/src/timeedit_ctrl.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/aegisub/src/dialog_jumpto.cpp b/aegisub/src/dialog_jumpto.cpp index 7ab7c7d1c..7acf60762 100644 --- a/aegisub/src/dialog_jumpto.cpp +++ b/aegisub/src/dialog_jumpto.cpp @@ -177,7 +177,7 @@ void DialogJumpTo::OnEditFrame (wxCommandEvent &event) { int newtime = VFR_Output.GetTimeAtFrame(jumpframe,true,true); if (jumptime.GetMS() != newtime) { jumptime.SetMS(newtime); - JumpTime->SetValue(jumptime.GetASSFormated()); + JumpTime->ChangeValue(jumptime.GetASSFormated()); } ready = true; diff --git a/aegisub/src/timeedit_ctrl.cpp b/aegisub/src/timeedit_ctrl.cpp index 6c70c0690..fb172c0d5 100644 --- a/aegisub/src/timeedit_ctrl.cpp +++ b/aegisub/src/timeedit_ctrl.cpp @@ -91,7 +91,6 @@ wxTextCtrl(parent,id,value,pos,size,TimeEditWindowStyle | style,validator,name) isEnd = false; modified = false; showModified = false; - UpdateTime(); Connect(wxEVT_COMMAND_TEXT_UPDATED,wxCommandEventHandler(TimeEdit::OnModified)); Connect(wxEVT_KILL_FOCUS,wxFocusEventHandler(TimeEdit::OnKillFocus)); }