[vlc-commits] macosx: prevent crashes when enabling or changing the marquee string ( close #5991)

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Jul 28 11:31:57 2012 -0300| [31a66c9c55654e06b946d3826a2008a755fcc901] | committer: Felix Paul Kühne

macosx: prevent crashes when enabling or changing the marquee string (close #5991)
(cherry picked from commit edee0a568395174b107369624b145f90d069cc1d)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=31a66c9c55654e06b946d3826a2008a755fcc901
---

 modules/gui/macosx/VideoEffects.m |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/gui/macosx/VideoEffects.m b/modules/gui/macosx/VideoEffects.m
index a2d8a72..b6d2530 100644
--- a/modules/gui/macosx/VideoEffects.m
+++ b/modules/gui/macosx/VideoEffects.m
@@ -25,6 +25,7 @@
 #import "intf.h"
 #import <vlc_common.h>
 #import <vlc_modules.h>
+#import <vlc_charset.h>
 #import "VideoEffects.h"
 
 #pragma mark -
@@ -539,7 +540,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
     vlc_object_t *p_filter;
 
     if( p_vout == NULL ) {
-        config_PutPsz( p_intf, psz_name, psz_value );
+        config_PutPsz( p_intf, psz_name, EnsureUTF8(psz_value) );
     } else {
         p_filter = vlc_object_find_name( pl_Get(p_intf), psz_filter );
 
@@ -548,8 +549,8 @@ static VLCVideoEffects *_o_sharedInstance = nil;
             vlc_object_release( p_vout );
             return;
         }
-        var_SetString( p_filter, psz_name, psz_value );
-        config_PutPsz( p_intf, psz_name, psz_value );
+        var_SetString( p_filter, psz_name, EnsureUTF8(psz_value) );
+        config_PutPsz( p_intf, psz_name, EnsureUTF8(psz_value) );
         vlc_object_release( p_vout );
         vlc_object_release( p_filter );
 
@@ -981,4 +982,4 @@ static VLCVideoEffects *_o_sharedInstance = nil;
     }
 }
 
- at end
\ No newline at end of file
+ at end