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

Merge pull request #2681 from Fastigium/copyconstructorcleanup

Browse Source 
Get rid of another copy constructor call to prevent Qt5 crashes
This commit is contained in:
Fastigium
2016-03-16 10:02:33 +01:00
parent e98b6a2966 908175d5f1
commit e8a4b586d5
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/FxMixer.h
View File

@@ -194,11 +194,6 @@ public:
return m_fxChannels.size();
}
inline QVector<FxChannel *> fxChannels() const
{
return m_fxChannels;
}
FxRouteVector m_fxRoutes;
private:

4
src/tracks/InstrumentTrack.cpp
View File

@@ -1191,9 +1191,9 @@ QMenu * InstrumentTrackView::createFxMenu(QString title, QString newFxLabel)
fxMenu->addAction( newFxLabel, this, SLOT( createFxLine() ) );
fxMenu->addSeparator();
for (int i = 0; i < Engine::fxMixer()->fxChannels().size(); ++i)
for (int i = 0; i < Engine::fxMixer()->numChannels(); ++i)
{
FxChannel * currentChannel = Engine::fxMixer()->fxChannels()[i];
FxChannel * currentChannel = Engine::fxMixer()->effectChannel( i );
if ( currentChannel != fxChannel )
{