From 226d14643231bd2bf55bd451962079bf3d485247 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 7 Nov 2015 18:22:07 +0000 Subject: [PATCH] Bugfix: cannot apply a module when the window is already a module --- app/ModulesHandle.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/ModulesHandle.cpp b/app/ModulesHandle.cpp index f205e94..64bc5dd 100644 --- a/app/ModulesHandle.cpp +++ b/app/ModulesHandle.cpp @@ -262,15 +262,18 @@ Void ModulesHandle::activateModule() QAction *pcAction = qobject_cast( sender() ); Qt::KeyboardModifiers keyModifiers = QApplication::keyboardModifiers(); Bool bTmpForceNewWindow = false; - if( keyModifiers & Qt::ControlModifier ) - { - bTmpForceNewWindow = true; - } + VideoSubWindow* pcVideoSubWindow = qobject_cast( m_pcMainWindowManager->activeSubWindow() ); if( !pcVideoSubWindow ) { return; } + + if( keyModifiers & Qt::ControlModifier || pcVideoSubWindow->checkCategory( VideoSubWindow::MODULE_SUBWINDOW ) ) + { + bTmpForceNewWindow = true; + } + QString ModuleIfName = pcAction->data().toString(); PlaYUVerModuleIf* pcCurrModuleIf = PlaYUVerModuleFactory::Get()->CreateModule( ModuleIfName.toLocal8Bit().constData() ); PlaYUVerAppModuleIf* pcCurrAppModuleIf = new PlaYUVerAppModuleIf( this, pcAction, pcCurrModuleIf );