Mac OS X gui: Don't try to change the interface from a non-main thread. (Should fix...

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 516c6dd7f1cf55f5cca5d08d9d79397015c9f8df..fcf3b84b28194fa076f5f8ab548be44a82d0af7b 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1056,7 +1056,6 @@ static VLCMain *_o_sharedMainInstance = nil;
             /* input stopped */
             p_intf->p_sys->b_intf_update = VLC_TRUE;
             p_intf->p_sys->i_play_status = END_S;
-            [self setScrollField: _NS("VLC media player") stopAfter:-1];
             msg_Dbg( p_intf, "input has stopped, refreshing interface" );
             p_intf->p_sys->p_input = NULL;
         }
@@ -1252,7 +1251,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     [self updateMessageArray];
 
-    if( (i_end_scroll != -1) && (mdate() > i_end_scroll) )
+    if( ((i_end_scroll != -1) && (mdate() > i_end_scroll)) || !p_input )
         [self resetScrollField];
 
     [NSTimer scheduledTimerWithTimeInterval: 0.3