mirror/lmms
1
0 Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-10-24 07:38:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes removing controller in controller rack bug

Browse Source
This commit is contained in:
Wong Cho Ching committed 2014-01-30 16:32:25 +08:00
1 parent 0ff636b363
commit 600232967a
9 files changed
+84 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/ControllerConnection.cpp
+12
View File
@@ -40,6 +40,7 @@ ControllerConnectionVector ControllerConnection::s_connections;
ControllerConnection::ControllerConnection( Controller * _controller ) :
m_controller( NULL ),
m_controllerId( -1 ),
m_ownsController( false )
{
@@ -71,6 +72,10 @@ ControllerConnection::ControllerConnection( int _controllerId ) :
ControllerConnection::~ControllerConnection()
{
if( m_controller && m_controller->type() != Controller::DummyController )
{
m_controller->removeConnection( this );
}
s_connections.remove( s_connections.indexOf( this ) );
if( m_ownsController )
{
@@ -93,6 +98,12 @@ void ControllerConnection::setController( Controller * _controller )
if( m_ownsController && m_controller )
{
delete m_controller;
m_controller = NULL;
}
if( m_controller && m_controller->type() != Controller::DummyController )
{
m_controller->removeConnection( this );
}
if( !_controller )
@@ -107,6 +118,7 @@ void ControllerConnection::setController( Controller * _controller )
if( _controller->type() != Controller::DummyController )
{
_controller->addConnection( this );
QObject::connect( _controller, SIGNAL( valueChanged() ),
this, SIGNAL( valueChanged() ) );
}