[vlc-commits] macosx: don't assign NULL as pref button tooltip

[Faustino E. Osuna]

vlc/vlc-1.2 | branch: master | Faustino E. Osuna <enrique.osuna at gmail.com> | Sun Jan 22 15:58:14 2012 +0100| [63b9d0a661c27d68912d972da347463149faee8d] | committer: Jean-Baptiste Kempf

macosx: don't assign NULL as pref button tooltip

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
(cherry picked from commit bf8c4379b6d16102c78f8a9de49e50c6c683502c)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=63b9d0a661c27d68912d972da347463149faee8d
---

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

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 5ea2e1c..1c9702c 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -433,7 +433,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
 - (void)setupButton: (NSButton *)object forBoolValue: (const char *)name
 {
     [object setState: config_GetInt( p_intf, name )];
-    [object setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, name )]];
+    [object setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, name ) ?: ""]];
 }
 
 - (void)setupField:(NSTextField *)o_object forOption:(const char *)psz_option