[vlc-commits] macosx: fixed obscure crash when starting playback while the messages panel is open (fixes #5541)

[Felix Paul Kühne]

vlc/vlc-1.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Dec 19 23:28:31 2011 +0100| [c3e783e86ec9116e2958a635673bdc1c3fcdb799] | committer: Jean-Baptiste Kempf

macosx: fixed obscure crash when starting playback while the messages panel is open (fixes #5541)
(cherry picked from commit 4c718f0ef3ed485347b16b21e62b80c929e6efd3)

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

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

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

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index ea90bd7..1dea43e 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1852,10 +1852,8 @@ unsigned int CocoaKeyToVLC( unichar i_key )
 
         o_enum = [o_msg_arr objectEnumerator];
 
-        while( ( o_msg = [o_enum nextObject] ) != nil )
-        {
+        while( ( o_msg = [o_enum nextObject] ) != NULL )
             [o_messages insertText: o_msg];
-        }
 
         b_msg_arr_changed = NO;
         [o_msg_lock unlock];
@@ -1883,7 +1881,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
         [o_msg_arr removeObjectAtIndex: 1];
     }
 
-    o_attr = [NSDictionary dictionaryWithObject: o_gray forKey: NSForegroundColorAttributeName];
+    o_attr = [NSDictionary dictionaryWithObject: pp_color[3] forKey: NSForegroundColorAttributeName];
     o_msg_color = [[NSAttributedString alloc] initWithString: [NSString stringWithFormat: @"%s%s", item->psz_module, ppsz_type[i_type]] attributes: o_attr];
     [o_msg_arr addObject: [o_msg_color autorelease]];