From d3f5764bd8de119437dbc1a44ac8a29006f82b5b Mon Sep 17 00:00:00 2001 From: lvw Date: Wed, 6 Oct 2004 21:48:50 +0000 Subject: Avoid crash when replay display is active and menu is to be shown git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@208 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_player.c | 16 ++++++++++++---- vdr_player.h | 3 +++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/vdr_player.c b/vdr_player.c index 865353e..39410a8 100644 --- a/vdr_player.c +++ b/vdr_player.c @@ -892,7 +892,7 @@ mgPlayerControl::~mgPlayerControl() m_szLastShowStatusMsg = NULL; } - Hide(); + InternalHide(); Stop(); } @@ -1047,11 +1047,19 @@ void mgPlayerControl::ShowProgress() } else { - Hide(); + InternalHide(); } } void mgPlayerControl::Hide() +{ + m_visible = false; + + InternalHide(); +} + + +void mgPlayerControl::InternalHide() { if( m_has_osd ) { @@ -1103,7 +1111,7 @@ eOSState mgPlayerControl::ProcessKey(eKeys key) case kStop: case kBlue: { - Hide(); + InternalHide(); Stop(); return osEnd; @@ -1117,7 +1125,7 @@ eOSState mgPlayerControl::ProcessKey(eKeys key) } break; case kBack: { - Hide(); + InternalHide(); Stop(); return osEnd; diff --git a/vdr_player.h b/vdr_player.h index 92b9e25..c70c4e1 100644 --- a/vdr_player.h +++ b/vdr_player.h @@ -122,6 +122,9 @@ public: //! \brief hide the osd, if present void Hide(); + //! \brief hide the osd, if present + void InternalHide(); + //! \brief process key events eOSState ProcessKey(eKeys key); -- cgit v1.2.3