Change the behaviour how modules are disabled

This commit is contained in:
jfmcarreira committed 2014-05-10 01:18:24 +01:00
1 parent 2a657477dc
commit 341e921de4
3 files changed
+8 -4

No files matched your search

+7 -2
View File
@@ -106,12 +106,12 @@ SubWindowHandle* ModulesHandle::toggleSelectedModuleIf( SubWindowHandle* pcSubWi
}
else
{
currModuleIf->m_pcSubWindow->disableModule();
destroyModuleIf( currModuleIf );
}
return interfaceChild;
}
Void ModulesHandle::destroyModuleIf( PlaYUVerModuleIf* pcCurrModuleIf )
Void ModulesHandle::destroyModuleIf( PlaYUVerModuleIf *pcCurrModuleIf )
{
pcCurrModuleIf->m_pcAction->setChecked( false );
if( pcCurrModuleIf->m_pcDisplaySubWindow )
@@ -119,6 +119,11 @@ Void ModulesHandle::destroyModuleIf( PlaYUVerModuleIf* pcCurrModuleIf )
pcCurrModuleIf->m_pcDisplaySubWindow->close();
pcCurrModuleIf->m_pcDisplaySubWindow = NULL;
}
else
{
pcCurrModuleIf->m_pcSubWindow->disableModule();
}
pcCurrModuleIf->m_pcSubWindow->refreshFrame();
pcCurrModuleIf->m_pcSubWindow = NULL;
pcCurrModuleIf->destroy();
}
+1 -1
View File
@@ -54,7 +54,7 @@ public:
QMenu* createMenus( QMenuBar *MainAppMenuBar );
Void updateMenus( Bool hasSubWindow );
SubWindowHandle* toggleSelectedModuleIf( SubWindowHandle* pcSubWindow );
static Void destroyModuleIf( PlaYUVerModuleIf* pcCurrModuleIf );
Void destroyModuleIf( PlaYUVerModuleIf* pcCurrModuleIf );
private:
QWidget *m_pcParent;
-1
View File
@@ -126,7 +126,6 @@ Void SubWindowHandle::disableModule()
{
if( !m_pcCurrentModule )
return;
ModulesHandle::destroyModuleIf( m_pcCurrentModule );
m_pcCurrentModule = NULL;
m_pcModuleSubWindow = NULL;
refreshFrame();