[vlc-commits] macosx: adopt courmisch's feedback, thx

Felix Paul Kühne git at videolan.org
Sun Aug 21 18:18:57 CEST 2011


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Aug 21 18:18:40 2011 +0200| [b6c6653521a69f5a72650eb4d4f14368a2cdc080] | committer: Felix Paul Kühne

macosx: adopt courmisch's feedback, thx

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

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

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 106e829..5461e98 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -224,12 +224,11 @@ static void MsgCallback( void *data, int type, const msg_item_t *item, const cha
     int canc = vlc_savecancel();
     char *str;
 
-    /* this may happen from time to time, let's bail out as info would be useless anyway */
-    if( !item->psz_module || !format )
-        return;
-
     if (vasprintf( &str, format, ap ) == -1)
+    {
+        vlc_restorecancel( canc );
         return;
+    }
 
     NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
     [[VLCMain sharedInstance] processReceivedlibvlcMessage: item ofType: type withStr: str];



More information about the vlc-commits mailing list