Merge branch 'master' into devel

app/SubWindowAbstract.h

@@ -136,7 +136,7 @@ public:
 
 protected:
   void focusInEvent( QFocusEvent* event );
-  void closeEvent( QCloseEvent* event );
+	virtual void closeEvent( QCloseEvent* event );
 
   Void setWidget( QWidget* widget );
 

app/VideoHandle.h

@@ -34,7 +34,7 @@
 #include <QVector>
 #include <QWidget>
 
-#define _CONTROL_PLAYING_TIME_ 1
+#define _CONTROL_PLAYING_TIME_ 0
 
 class QToolBar;
 class QDockWidget;

app/VideoSubWindow.cpp

@@ -194,6 +194,12 @@ VideoSubWindow::~VideoSubWindow()
  * Events handlers
  */
 
+Void VideoSubWindow::closeEvent( QCloseEvent* event )
+{
+	stop();
+	SubWindowAbstract::closeEvent( event );
+}
+
 Void VideoSubWindow::keyPressEvent( QKeyEvent* event )
 {
   if( m_pcCurrentDisplayModule )
@@ -789,6 +795,10 @@ Void VideoSubWindow::seekRelativeEvent( Bool bIsFoward )
 
 Void VideoSubWindow::stop()
 {
+#ifndef QT_NO_CONCURRENT
+	m_cRefreshResult.waitForFinished();
+	m_cReadResult.waitForFinished();
+#endif
   m_bIsPlaying = false;
   seekAbsoluteEvent( 0 );
   return;

app/VideoSubWindow.h

@@ -207,7 +207,7 @@ private:
 protected:
   Void keyPressEvent( QKeyEvent* event );
   Void resizeEvent( QResizeEvent* event );
-  // void closeEvent( QCloseEvent *event );
+	Void closeEvent( QCloseEvent *event );
 
 public Q_SLOTS:
   void updateWindowOnTimeout();

lib/StreamHandlerLibav.cpp

@@ -374,6 +374,9 @@ Bool StreamHandlerLibav::write( PlaYUVerFrame* pcFrame )
 
 Bool StreamHandlerLibav::seek( UInt64 iFrameNum )
 {
+	if( m_uiTotalNumberFrames == 1 )
+		return true;
+
   if( m_uiCurrFrameFileIdx == iFrameNum )
     return true;