videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Fix crash if we don't have freetype or subsdec

This commit is contained in:
Clément Stenac 2005-04-24 20:44:36 +00:00
parent f4809fcca0
commit fbc81b7254
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/gui/wxwindows/open.cpp
View File

@ -1328,15 +1328,22 @@ void OpenDialog::OnSubsFileSettings( wxCommandEvent& WXUNUSED(event) )
subsfile_mrl.Add( wxString(wxT("sub-file=")) +
subsfile_dialog->file_combo->GetValue() );
if( subsfile_dialog->encoding_combo )
{
subsfile_mrl.Add( wxString(wxT("subsdec-encoding=")) +
subsfile_dialog->encoding_combo->GetValue() );
subsfile_mrl.Add( wxString::Format(wxT("subsdec-align=%i"),
(int)subsfile_dialog->align_combo->GetClientData(
subsfile_dialog->align_combo->GetSelection()) ) );
subsfile_mrl.Add( wxString::Format( wxT("freetype-rel-fontsize=%i"),
(int)subsfile_dialog->size_combo->GetClientData(
subsfile_dialog->size_combo->GetSelection()) ) );
}
if( subsfile_dialog->align_combo )
{
subsfile_mrl.Add( wxString::Format(wxT("subsdec-align=%i"),
(int)subsfile_dialog->align_combo->GetClientData(
subsfile_dialog->align_combo->GetSelection()) ) );
}
if( subsfile_dialog->size_combo )
{
subsfile_mrl.Add( wxString::Format( wxT("freetype-rel-fontsize=%i"),
(int)subsfile_dialog->size_combo->GetClientData(
subsfile_dialog->size_combo->GetSelection()) ) );
}
subsfile_mrl.Add( wxString::Format( wxT("sub-fps=%i"),
subsfile_dialog->fps_spinctrl->GetValue() ) );
subsfile_mrl.Add( wxString::Format( wxT("sub-delay=%i"),