From 4307d1a24ccf8b5dc8e269f422be2c2470a4c118 Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Sat, 5 Jul 2014 02:30:21 +0100
Subject: [PATCH] merge master into devel

---
 source/app/ViewArea.cpp    | 1 +
 source/app/plaYUVerApp.cpp | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/app/ViewArea.cpp b/source/app/ViewArea.cpp
index e40feef..dbba02c 100644
--- a/source/app/ViewArea.cpp
+++ b/source/app/ViewArea.cpp
@@ -139,6 +139,7 @@ Void ViewArea::zoomChangeEvent( Double factor, QPoint center )
 
   setZoomFactor( zoomFactor );
   emit zoomFactorChanged( factor, center );
+
 }
 
 void ViewArea::setMode( ViewMode mode )
diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp
index 2f11728..0bb3359 100644
--- a/source/app/plaYUVerApp.cpp
+++ b/source/app/plaYUVerApp.cpp
@@ -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();
     }
   }
 }