merge master into devel

This commit is contained in:
jfmcarreira committed 2014-07-05 02:30:21 +01:00
1 parent 51d28ed0f8
commit 4307d1a24c
2 files changed
+5 -3

No files matched your search

+1
View File
@@ -139,6 +139,7 @@ Void ViewArea::zoomChangeEvent( Double factor, QPoint center )
setZoomFactor( zoomFactor );
emit zoomFactorChanged( factor, center );
}
void ViewArea::setMode( ViewMode mode )
+4 -3
View File
@@ -657,12 +657,13 @@ Void plaYUVerApp::lockButtonEvent()
{
if( m_acPlayingSubWindows.contains( m_pcCurrentSubWindow ) )
{
stop();
play();
m_acPlayingSubWindows.clear();
m_acPlayingSubWindows.append(m_pcCurrentSubWindow);
}
else
{
stop();
if( m_acPlayingSubWindows.size() > 1 )
m_acPlayingSubWindows.clear();
}
}
}