Merge branch 'master' into devel
This commit is contained in:
commit
265872cf76
4 files changed
+60
-14
No files matched your search
@@ -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 )
|
||||
|
||||
Reference in new issue
Block a user