vlc/vlc-2.2 | branch: master | David Fuhrmann <[email protected]> | Sat Oct 18 11:21:51 2014 +0200| [f9f386157af15d8c1e1f0180503f9c8b459e5b8d] | committer: David Fuhrmann
macosx: fix podcast view interfering with dropzone (cherry picked from commit 2b6a8709c5282bf40b3667376d7e67b6ca46b262) Signed-off-by: David Fuhrmann <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f9f386157af15d8c1e1f0180503f9c8b459e5b8d --- modules/gui/macosx/MainWindow.m | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index eaca43e..7a34367 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -1145,6 +1145,12 @@ static VLCMainWindow *_o_sharedInstance = nil; [[[VLCMain sharedInstance] playlist] setPlaylistRoot: pl_item]; } + // Note the order: first hide the podcast controls, then show the drop zone + if ([[item identifier] isEqualToString:@"podcast{longname=\"Podcasts\"}"]) + [self showPodcastControls]; + else + [self hidePodcastControls]; + PL_LOCK; if ([[[VLCMain sharedInstance] playlist] currentPlaylistRoot] != p_playlist->p_local_category || p_playlist->p_local_category->i_children > 0) [self hideDropZone]; @@ -1152,11 +1158,6 @@ static VLCMainWindow *_o_sharedInstance = nil; [self showDropZone]; PL_UNLOCK; - if ([[item identifier] isEqualToString:@"podcast{longname=\"Podcasts\"}"]) - [self showPodcastControls]; - else - [self hidePodcastControls]; - [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCMediaKeySupportSettingChanged" object: nil userInfo: nil]; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
