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

Use %ld for both wxFileOffset (off_t) and GetTicks() (time_t), also coalesce into a single wxString::Format. This fixes an assert in wx trunk. Unfortunatly it does not fix audio loading due to seperate breakage of libass in r4630:4631. closes #1228. 

Originally committed to SVN as r4681.
This commit is contained in:
Amar Takhar 2010-07-16 10:33:54 +00:00
parent a32bbab0b6
commit d3e9a906aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aegisub/src/ffmpegsource_common.cpp
View File

@ -229,9 +229,9 @@ wxString FFmpegSourceProvider::GetCacheFilename(const wxString& _filename)
wxFileName filename(_filename); wxFileName filename(_filename);
// Generate string to be hashed // Generate string to be hashed //
wxString toHash = filename.GetFullName() + wxString::Format(_T(":%i"),len) wxString toHash = wxString::Format(_T("%s %ld %ld"), filename.GetFullName(), len, filename.GetModificationTime().GetTicks());
+ wxString::Format(_T(":%i"), filename.GetModificationTime().GetTicks());
// Get the MD5 digest of the string // Get the MD5 digest of the string
const wchar_t *tmp = toHash.wc_str(); const wchar_t *tmp = toHash.wc_str();