iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge r3668 into milestone:2.1.8. Closes #1003. 

Originally committed to SVN as r3670.
This commit is contained in:
harukalover 2009-10-09 19:57:30 +00:00
parent a0322120e0
commit e0b6c8bf47
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aegisub/src/dialog_jumpto.cpp
View File

@ -177,7 +177,7 @@ void DialogJumpTo::OnEditFrame (wxCommandEvent &event) {
int newtime = VFR_Output.GetTimeAtFrame(jumpframe,true,true); int newtime = VFR_Output.GetTimeAtFrame(jumpframe,true,true);
if (jumptime.GetMS() != newtime) { if (jumptime.GetMS() != newtime) {
jumptime.SetMS(newtime); jumptime.SetMS(newtime);
JumpTime->SetValue(jumptime.GetASSFormated()); JumpTime->ChangeValue(jumptime.GetASSFormated());
} }
ready = true; ready = true;

1
aegisub/src/timeedit_ctrl.cpp
View File

@ -91,7 +91,6 @@ wxTextCtrl(parent,id,value,pos,size,TimeEditWindowStyle | style,validator,name)
isEnd = false; isEnd = false;
modified = false; modified = false;
showModified = false; showModified = false;
UpdateTime();
Connect(wxEVT_COMMAND_TEXT_UPDATED,wxCommandEventHandler(TimeEdit::OnModified)); Connect(wxEVT_COMMAND_TEXT_UPDATED,wxCommandEventHandler(TimeEdit::OnModified));
Connect(wxEVT_KILL_FOCUS,wxFocusEventHandler(TimeEdit::OnKillFocus)); Connect(wxEVT_KILL_FOCUS,wxFocusEventHandler(TimeEdit::OnKillFocus));
} }