aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <martijn@xbmc.org>2015-02-16 07:18:10 +0100
committerMartijn Kaijser <martijn@xbmc.org>2015-02-16 07:18:10 +0100
commitb5dd931988367e3a9f4f74177e59b271a9b6d21b (patch)
tree8a4df42f515c31952546e7e52aab628b686c4ce6
parent646218117119fccd4ddd946fae65ec00fced7ed4 (diff)
parent7c3e7920363d811f51094d9f05925680ce5e97aa (diff)
Merge pull request #6446 from popcornmix/omx_flush_err
[omxcore] Skip out of flush on error
-rw-r--r--xbmc/linux/OMXCore.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/linux/OMXCore.cpp b/xbmc/linux/OMXCore.cpp
index 4ba2e4bc4b..5f91787a15 100644
--- a/xbmc/linux/OMXCore.cpp
+++ b/xbmc/linux/OMXCore.cpp
@@ -420,7 +420,7 @@ void COMXCoreComponent::FlushAll()
void COMXCoreComponent::FlushInput()
{
- if(!m_handle)
+ if(!m_handle || m_resource_error)
return;
OMX_ERRORTYPE omx_err = OMX_SendCommand(m_handle, OMX_CommandFlush, m_input_port, NULL);
@@ -435,7 +435,7 @@ void COMXCoreComponent::FlushInput()
void COMXCoreComponent::FlushOutput()
{
- if(!m_handle)
+ if(!m_handle || m_resource_error)
return;
OMX_ERRORTYPE omx_err = OMX_SendCommand(m_handle, OMX_CommandFlush, m_output_port, NULL);