[vlc-devel] commit: macosx: fixed issue which could lead to a locked up state ( Felix Paul Kühne )

git version control git at videolan.org
Mon Jul 27 10:54:11 CEST 2009


vlc | branch: 0.9-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Mon Jul 27 10:53:10 2009 +0200| [0fd96f3e8bacb92ffea22c6015b092cbaa6eb995] | committer: Felix Paul Kühne 

macosx: fixed issue which could lead to a locked up state

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0fd96f3e8bacb92ffea22c6015b092cbaa6eb995
---

 modules/gui/macosx/simple_prefs.m |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 72c806a..3cecd2f 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -939,7 +939,10 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
     {
         config_PutInt( p_intf, "osd", [o_osd_osd_ckb state] );
 
-        SaveStringList( o_osd_encoding_pop, "subsdec-encoding" );
+        if( [o_osd_encoding_pop indexOfSelectedItem] >= 0 )
+            SaveStringList( o_osd_encoding_pop, "subsdec-encoding" );
+        else
+            config_PutPsz( p_intf, "subsdec-encoding", "" );
 
         config_PutPsz( p_intf, "sub-language", [[o_osd_lang_fld stringValue] UTF8String] );
         config_PutPsz( p_intf, "quartztext-font", [[o_osd_font_fld stringValue] UTF8String] );




More information about the vlc-devel mailing list