Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2015-04-29 01:10:24 +01:00
commit 265872cf76
4 files changed
+60 -14

No files matched your search

+3 -7
View File
@@ -208,19 +208,15 @@ Void VideoSubWindow::refreshSubWindow()
{
if( getCategory() & SubWindowAbstract::VIDEO_STREAM_SUBWINDOW )
{
Int currFrameNum = m_pCurrStream->getCurrFrameNum();
if( !loadFile( m_cFilename, false ) )
if( !m_pCurrStream->reload() )
{
close();
return;
}
seekAbsoluteEvent( currFrameNum );
}
else
{
refreshFrame();
//seekAbsoluteEvent( currFrameNum );
}
updateVideoWindowInfo();
refreshFrame();
}
Bool VideoSubWindow::loadFile( QString cFilename, Bool bForceDialog )