[vlc-commits] macosx: fixed rare crash, which could be triggered by optical stream format descriptions output by the auhal module

[Felix Paul Kühne]

vlc/vlc-1.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Jul 29 22:40:16 2011 +0200| [09e9ef3281fb9e135365c4f3e24d5f62c58afcda] | committer: Felix Paul Kühne

macosx: fixed rare crash, which could be triggered by optical stream format descriptions output by the auhal module

and fixed a compiler warning

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

 modules/gui/macosx/intf.h |    2 +-
 modules/gui/macosx/intf.m |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 7e14eea..e7e0511 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -104,7 +104,7 @@ struct intf_sys_t
     id o_bookmarks;             /* VLCBookmarks   */
     id o_embedded_list;         /* VLCEmbeddedList*/
     id o_coredialogs;           /* VLCCoreDialogProvider */
-    VLCInformation * o_info;    /* VLCInformation */
+    id o_info;                /* VLCInfo */
     id o_eyetv;                 /* VLCEyeTVController */
     BOOL nib_main_loaded;       /* main nibfile */
     BOOL nib_open_loaded;       /* open nibfile */
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 535e9b9..bdcfdcb 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -2589,9 +2589,8 @@ end:
 
     o_attr = [NSDictionary dictionaryWithObject: pp_color[i_type]
                                          forKey: NSForegroundColorAttributeName];
-    o_msg = [[[o_notification userInfo] objectForKey: @"Message"] stringByAppendingString: @"\n"];
-    o_msg_color = [[NSAttributedString alloc]
-                   initWithString: o_msg attributes: o_attr];
+    o_msg = [NSString stringWithFormat:@"%@\n", [[o_notification userInfo] objectForKey: @"Message"]];
+    o_msg_color = [[NSAttributedString alloc] initWithString: o_msg attributes: o_attr];
     [o_msg_arr addObject: [o_msg_color autorelease]];
 
     b_msg_arr_changed = YES;