From 14959b8a2fe5fe011396a8e889ab7e42096a2ac1 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 18 Apr 2015 04:49:23 +0100 Subject: [PATCH] Fix bug in syncronized zoom - Window may not exist --- app/VideoHandle.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/VideoHandle.cpp b/app/VideoHandle.cpp index 8fc0233..b620472 100644 --- a/app/VideoHandle.cpp +++ b/app/VideoHandle.cpp @@ -93,11 +93,11 @@ Void VideoHandle::createActions() m_arrayActions[VIDEO_LOOP_ACT]->setCheckable( true ); m_arrayActions[VIDEO_LOOP_ACT]->setChecked( false ); - m_arrayActions[VIDEO_ZOOM_LOCK_ACT] = new QAction( "Video Zoom Lock", this ); + m_arrayActions[VIDEO_ZOOM_LOCK_ACT] = new QAction( "Zoom Lock", this ); m_arrayActions[VIDEO_ZOOM_LOCK_ACT]->setCheckable( true ); m_arrayActions[VIDEO_ZOOM_LOCK_ACT]->setChecked( false ); - m_arrayActions[VIDEO_LOCK_SELECTION_ACT] = new QAction( "Video Lock Window Selection", this ); + m_arrayActions[VIDEO_LOCK_SELECTION_ACT] = new QAction( "Playing Lock", this ); connect( m_arrayActions[VIDEO_LOCK_SELECTION_ACT], SIGNAL( triggered() ), this, SLOT( videoSelectionButtonEvent() ) ); m_pcFrameSlider = new QSlider; @@ -330,7 +330,7 @@ Void VideoHandle::zoomToFactorAll( const Double scale, const QPoint center ) Void VideoHandle::moveAllScrollBars( const QPoint offset ) { QPoint newOffset = offset; - if( m_arrayActions[VIDEO_ZOOM_LOCK_ACT]->isChecked() ) + if( m_arrayActions[VIDEO_ZOOM_LOCK_ACT]->isChecked() && m_pcCurrentVideoSubWindow ) { SubWindowAbstract *subWindow; QList subWindowList = m_pcMainWindowManager->findSubWindow( SubWindowAbstract::VIDEO_SUBWINDOW );