summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlvw <lvw@e10066b5-e1e2-0310-b819-94efdf66514b>2004-10-06 21:48:50 +0000
committerlvw <lvw@e10066b5-e1e2-0310-b819-94efdf66514b>2004-10-06 21:48:50 +0000
commitb504cd03caf1e82ea6c1a4795f5ee300c537928f (patch)
tree243afc8aad5f9e9a89e7b3e942a51675e57ee620
parent8eccbabacd7ea1d4f054b1c0e49f2a1671cf62b6 (diff)
downloadvdr-plugin-muggle-b504cd03caf1e82ea6c1a4795f5ee300c537928f.tar.gz
vdr-plugin-muggle-b504cd03caf1e82ea6c1a4795f5ee300c537928f.tar.bz2
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@208 e10066b5-e1e2-0310-b819-94efdf66514b
-rw-r--r--muggle-plugin/vdr_player.c16
-rw-r--r--muggle-plugin/vdr_player.h3
2 files changed, 15 insertions, 4 deletions
diff --git a/muggle-plugin/vdr_player.c b/muggle-plugin/vdr_player.c
index 865353e..39410a8 100644
--- a/muggle-plugin/vdr_player.c
+++ b/muggle-plugin/vdr_player.c
@@ -892,7 +892,7 @@ mgPlayerControl::~mgPlayerControl()
m_szLastShowStatusMsg = NULL;
}
- Hide();
+ InternalHide();
Stop();
}
@@ -1047,12 +1047,20 @@ void mgPlayerControl::ShowProgress()
}
else
{
- Hide();
+ InternalHide();
}
}
void mgPlayerControl::Hide()
{
+ m_visible = false;
+
+ InternalHide();
+}
+
+
+void mgPlayerControl::InternalHide()
+{
if( m_has_osd )
{
#if VDRVERSNUM >= 10307
@@ -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/muggle-plugin/vdr_player.h b/muggle-plugin/vdr_player.h
index 92b9e25..c70c4e1 100644
--- a/muggle-plugin/vdr_player.h
+++ b/muggle-plugin/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);