summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoretobi <git@e-tobi.net>2012-02-12 13:41:01 +0100
committeretobi <git@e-tobi.net>2012-02-12 13:41:01 +0100
commit8ccbccf59b76cba1018757e5b7a92cb0a580d1d9 (patch)
tree2701e988a5e2d99ce02aca00e6de336645ec7773
parentc6ba6fe4d24f8a0fff692423d3cc35c6fcb79a34 (diff)
downloadvdr-plugin-osdpip-8ccbccf59b76cba1018757e5b7a92cb0a580d1d9.tar.gz
vdr-plugin-osdpip-8ccbccf59b76cba1018757e5b7a92cb0a580d1d9.tar.bz2
Avoid segfault at stop replay with keystroke '0' (Patch provided by Andreas Brachold) (closes #592)
-rw-r--r--HISTORY2
-rw-r--r--osd.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 01065c7..0a3c869 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6,6 +6,8 @@ VDR Plugin 'osdpip' Revision History
- Fixed compile error with newer ffmpeg versions >= svn 20100426 (closes #345)
- Replaced deprected ffmpeg calls (Patch provided by mnival) (closes #690)
- Updated french translation (Patch provided by mnival) (closes #691)
+- Avoid segfault at stop replay with keystroke '0' (Patch provided by
+ Andreas Brachold) (closes #592)
2010-03-28: Version 0.1.0
diff --git a/osd.c b/osd.c
index db021e4..136976a 100644
--- a/osd.c
+++ b/osd.c
@@ -625,7 +625,7 @@ void cOsdPipObject::StopReplay(void)
{
cControl::Control()->ProcessKey(kStop);
cDevice::PrimaryDevice()->StopReplay();
- if (m_InfoWindow->Shown())
+ if (m_InfoWindow && m_InfoWindow->Shown())
m_InfoWindow->Hide();
Channels.SwitchTo(cDevice::CurrentChannel());
}