[vlc-commits] macosx: Fix font selection when some fonts are disabled

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sun Jan 25 16:04:29 2015 +0100| [bf31a6b4648b803be4d45829e6d29e7d640a6787] | committer: David Fuhrmann

macosx: Fix font selection when some fonts are disabled

Usage of selectedFont inside changeFont: is not allowed, and its
not needed as all the necessary work is done in convertFont:.

close #13740

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

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

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index d51e1fd..66d0c2f 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -1268,8 +1268,12 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
 
 - (void)changeFont:(id)sender
 {
-    NSFont * font = [sender convertFont:[[NSFontManager sharedFontManager] selectedFont]];
-    [o_osd_font_fld setStringValue:[font fontName]];
+    NSFont *someFont = [NSFont systemFontOfSize:12];
+
+    // converts given font to changes in font panel. Original font is irrelevant
+    NSFont *selectedFont = [sender convertFont:someFont];
+
+    [o_osd_font_fld setStringValue:[selectedFont fontName]];
     [self osdSettingChanged:self];
 }