mirror of
https://code.videolan.org/videolan/vlc
synced 2024-10-03 01:31:53 +02:00
Fix crash if we don't have freetype or subsdec
This commit is contained in:
parent
f4809fcca0
commit
fbc81b7254
@ -1328,15 +1328,22 @@ void OpenDialog::OnSubsFileSettings( wxCommandEvent& WXUNUSED(event) )
|
|||||||
subsfile_mrl.Add( wxString(wxT("sub-file=")) +
|
subsfile_mrl.Add( wxString(wxT("sub-file=")) +
|
||||||
subsfile_dialog->file_combo->GetValue() );
|
subsfile_dialog->file_combo->GetValue() );
|
||||||
if( subsfile_dialog->encoding_combo )
|
if( subsfile_dialog->encoding_combo )
|
||||||
|
{
|
||||||
subsfile_mrl.Add( wxString(wxT("subsdec-encoding=")) +
|
subsfile_mrl.Add( wxString(wxT("subsdec-encoding=")) +
|
||||||
subsfile_dialog->encoding_combo->GetValue() );
|
subsfile_dialog->encoding_combo->GetValue() );
|
||||||
subsfile_mrl.Add( wxString::Format(wxT("subsdec-align=%i"),
|
}
|
||||||
(int)subsfile_dialog->align_combo->GetClientData(
|
if( subsfile_dialog->align_combo )
|
||||||
subsfile_dialog->align_combo->GetSelection()) ) );
|
{
|
||||||
|
subsfile_mrl.Add( wxString::Format(wxT("subsdec-align=%i"),
|
||||||
subsfile_mrl.Add( wxString::Format( wxT("freetype-rel-fontsize=%i"),
|
(int)subsfile_dialog->align_combo->GetClientData(
|
||||||
(int)subsfile_dialog->size_combo->GetClientData(
|
subsfile_dialog->align_combo->GetSelection()) ) );
|
||||||
subsfile_dialog->size_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_mrl.Add( wxString::Format( wxT("sub-fps=%i"),
|
||||||
subsfile_dialog->fps_spinctrl->GetValue() ) );
|
subsfile_dialog->fps_spinctrl->GetValue() ) );
|
||||||
subsfile_mrl.Add( wxString::Format( wxT("sub-delay=%i"),
|
subsfile_mrl.Add( wxString::Format( wxT("sub-delay=%i"),
|
||||||
|
Loading…
Reference in New Issue
Block a user