From ffd71d3d19742cef58981cd7cba8e22d79320128 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Tue, 20 Aug 2013 13:04:55 +1200 Subject: [PATCH] MediaPlayer: revert hrev38440 With #6610 fixed, it is now possible to open disabled menus in a menubar, so the workaround introduced in hrev33840 is no longer needed. Signed-off-by: John Scipione --- src/apps/mediaplayer/MainWin.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp index d2754a84b1..f10524099f 100644 --- a/src/apps/mediaplayer/MainWin.cpp +++ b/src/apps/mediaplayer/MainWin.cpp @@ -1626,7 +1626,7 @@ MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu, "Audio track menu"), new BMessage(M_DUMMY))); audioTrackMenu->ItemAt(0)->SetMarked(true); } - + audioTrackMenu->SetEnabled(count > 1); count = fController->VideoTrackCount(); current = fController->CurrentVideoTrack(); @@ -1641,6 +1641,7 @@ MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu, videoTrackMenu->AddItem(new BMenuItem("none", new BMessage(M_DUMMY))); videoTrackMenu->ItemAt(0)->SetMarked(true); } + videoTrackMenu->SetEnabled(count > 1); count = fController->SubTitleTrackCount(); if (count > 0) { @@ -1670,6 +1671,7 @@ MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu, new BMessage(M_DUMMY))); subTitleTrackMenu->ItemAt(0)->SetMarked(true); } + subTitleTrackMenu->SetEnabled(count > 1); }