From: Clément Stenac <zorglub@videolan.org>
Date: Sun, 24 Apr 2005 20:44:36 +0000 (+0000)
Subject: Fix crash if we don't have freetype or subsdec
X-Git-Tag: 0.8.2~407
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fbc81b72541fd125269a328a881286acbc98b342;p=vlc

Fix crash if we don't have freetype or subsdec
---

diff --git a/modules/gui/wxwindows/open.cpp b/modules/gui/wxwindows/open.cpp
index 8d356555bb..ff1189e386 100644
--- a/modules/gui/wxwindows/open.cpp
+++ b/modules/gui/wxwindows/open.cpp
@@ -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"),