vlc | branch: master | Brendon Justin <[email protected]> | Wed Jan 18 16:35:39 2012 -0500| [fa4b920d664728768c3d15fe7ffc0f0a348cce9e] | committer: Jean-Baptiste Kempf
macosx: Custom caching option should not set values Selecting 'Custom' for cache level in simple preferences should leave current settings alone. Custom levels are set in advanced preferences. Fixes #5868. Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa4b920d664728768c3d15fe7ffc0f0a348cce9e --- modules/gui/macosx/simple_prefs.m | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index fae88a3..9ae34f3 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -902,10 +902,17 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch #define CaCi( name, int ) config_PutInt( p_intf, name, int * [[o_input_cachelevel_pop selectedItem] tag] ) #define CaC( name ) CaCi( name, 1 ) - msg_Dbg( p_intf, "Adjusting all cache values to: %i", (int)[[o_input_cachelevel_pop selectedItem] tag] ); - CaC( "network-caching" ); - CaC( "disc-caching" ); - CaC( "live-caching" ); + if ( [[o_input_cachelevel_pop selectedItem] tag] == 0 ) + { + msg_Dbg( p_intf, "Custom chosen, not adjusting cache values" ); + } + else + { + msg_Dbg( p_intf, "Adjusting all cache values to: %i", (int)[[o_input_cachelevel_pop selectedItem] tag] ); + CaC( "network-caching" ); + CaC( "disc-caching" ); + CaC( "live-caching" ); + } b_inputSettingChanged = NO; } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
