hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #1557 from curlymorphic/i1352

Browse Source 
Proposed fix for 1352 Mk2, move the loaded instrument to the parent thre...
This commit is contained in:
Tres Finocchiaro
2015-01-10 09:40:48 -05:00
parent 9ffbef6f6e 7588f235ee
commit afa55cae89
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/TrackContainerView.cpp
View File

@@ -325,7 +325,9 @@ void TrackContainerView::dropEvent( QDropEvent * _de )
InstrumentTrack * it = dynamic_cast<InstrumentTrack *>(
Track::create( Track::InstrumentTrack,
m_tc ) );
it->loadInstrument( value );
InstrumentLoaderThread *ilt = new InstrumentLoaderThread(
this, it, value );
ilt->start();
//it->toggledInstrumentTrackButton( true );
_de->accept();
}
@@ -453,6 +455,22 @@ void TrackContainerView::scrollArea::wheelEvent( QWheelEvent * _we )
InstrumentLoaderThread::InstrumentLoaderThread( QObject *parent, InstrumentTrack *it, QString name ) :
QThread( parent ),
m_it( it ),
m_name( name )
{
m_containerThread = thread();
}
void InstrumentLoaderThread::run()
{
Instrument *i = m_it->loadInstrument( m_name );
QObject *parent = i->parent();
i->setParent( 0 );
i->moveToThread( m_containerThread );
i->setParent( parent );
}