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

Merge branch 'stable-1.1'

Browse Source 
Conflicts:
	data/locale/de.qm
	data/locale/de.ts
	src/gui/FxMixerView.cpp
This commit is contained in:
Vesa
2014-11-17 13:25:45 +02:00
parent cd509b707b 7c901d4dfd
commit dfb89c8c92
11 changed files with 367 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/EffectSelectDialog.cpp
View File

@@ -128,6 +128,7 @@ EffectSelectDialog::EffectSelectDialog( QWidget * _parent ) :
EffectSelectDialog::~EffectSelectDialog()
{
delete ui;
}

2
src/gui/FxMixerView.cpp
View File

@@ -412,12 +412,12 @@ void FxMixerView::moveChannelLeft(int index)
int replaceIndex = chLayout->indexOf(m_fxChannelViews[i]->m_fxLine);
chLayout->removeWidget(m_fxChannelViews[i]->m_fxLine);
m_racksLayout->removeWidget( m_fxChannelViews[i]->m_rackView );
delete m_fxChannelViews[i]->m_fader;
delete m_fxChannelViews[i]->m_muteBtn;
delete m_fxChannelViews[i]->m_soloBtn;
delete m_fxChannelViews[i]->m_fxLine;
delete m_fxChannelViews[i];
m_racksLayout->removeWidget( m_fxChannelViews[i]->m_rackView );
// add it again
m_fxChannelViews[i] = new FxChannelView( m_channelAreaWidget, this, i );