Merge branch 'master' into dev_DialogWindowSelector

This commit is contained in:
jfmcarreira committed 2014-05-09 00:40:02 +01:00
commit 0e7dea265a
3 files changed
+11 -5

No files matched your search

+2 -2
View File
@@ -438,7 +438,7 @@ void plaYUVerApp::playEvent()
Void plaYUVerApp::updateCurrFrameNum()
{
if( m_pcCurrentSubWindow )
if( m_pcCurrentSubWindow && m_pcCurrentSubWindow->getInputStream() )
{
Int frame_num = m_pcCurrentSubWindow->getInputStream()->getCurrFrameNum();
m_pcFrameSlider->setValue( frame_num );
@@ -447,7 +447,7 @@ Void plaYUVerApp::updateCurrFrameNum()
}
Void plaYUVerApp::updateTotalFrameNum( UInt total_frame_num )
{
if( m_pcCurrentSubWindow && total_frame_num == 0 )
if( m_pcCurrentSubWindow && m_pcCurrentSubWindow->getInputStream() && total_frame_num == 0 )
{
total_frame_num = m_pcCurrentSubWindow->getInputStream()->getFrameNum();
}