[vlc-commits] macosx: fixed crash due to race condition on launch

Felix Paul Kühne git at videolan.org
Tue Oct 2 13:52:44 CEST 2012


vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Oct  1 23:38:37 2012 +0200| [413ecd64f4f34cb2c8a13edc1078d932517f9876] | committer: Felix Paul Kühne

macosx: fixed crash due to race condition on launch

The main window may be asked to update its content prior to VLCFSPanel being fully initialized
(cherry picked from commit 8ef447a49d49598e5b022c4b2f03a3b8a6a24d98)

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

 modules/gui/macosx/MainWindow.m |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index b6b628b..716b6e7 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -1470,7 +1470,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
     [o_time_sld setEnabled: b_seekable];
     [self updateTimeSlider];
-    [o_fspanel setSeekable: b_seekable];
+    if ([o_fspanel respondsToSelector:@selector(setSeekable:)])
+        [o_fspanel setSeekable: b_seekable];
 
     PL_LOCK;
     if ([[[VLCMain sharedInstance] playlist] currentPlaylistRoot] != p_playlist->p_local_category || p_playlist->p_local_category->i_children > 0)



More information about the vlc-commits mailing list