aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Browet <koying@semperpax.com>2015-03-31 18:37:07 +0200
committerChris Browet <koying@semperpax.com>2015-03-31 18:37:07 +0200
commit32c1f532084a2fd642a19c75a185dd2a3434c5d2 (patch)
treea399c308addeb97d7b16256f5f6c7424a857bf3d
parentfcabf6f7e7ade78e4ede3f7f10f1691b9a0f7cbf (diff)
parent393f06d2b431174f7b491bf32e43ce27b08c6c11 (diff)
Merge pull request #6852 from koying/quickPR15.0a2-Isengard
FIX: [droid;amc] crash when calling dispose twice
-rw-r--r--xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp
index c56852e78b..0ebbe637b8 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp
@@ -497,6 +497,9 @@ bool CDVDVideoCodecAndroidMediaCodec::Open(CDVDStreamInfo &hints, CDVDCodecOptio
void CDVDVideoCodecAndroidMediaCodec::Dispose()
{
+ if (!m_opened)
+ return;
+
m_opened = false;
// release any retained demux packets