Fix some bugs with LFO waveform drag&drop (LMMS#4227)

* Change to user-wave mode and update display after dropping a sample * Fix broken drag&drop from sample tracks
sdasda7777 · Mar 14, 2018 · 40a44ca · 40a44ca
1 parent 208d5d1
commit 40a44ca
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/gui/widgets/EnvelopeAndLfoView.cpp b/src/gui/widgets/EnvelopeAndLfoView.cpp
@@ -393,14 +393,20 @@ void EnvelopeAndLfoView::dropEvent( QDropEvent * _de )
 		m_params->m_userWave.setAudioFile(
 					StringPairDrag::decodeValue( _de ) );
 		m_userLfoBtn->model()->setValue( true );
+		m_params->m_lfoWaveModel.setValue(EnvelopeAndLfoParameters::UserDefinedWave);
 		_de->accept();
+		update();
 	}
 	else if( type == QString( "tco_%1" ).arg( Track::SampleTrack ) )
 	{
 		DataFile dataFile( value.toUtf8() );
-		m_params->m_userWave.setAudioFile( dataFile.content().firstChild().toElement().  attribute( "src" ) );
+		m_params->m_userWave.setAudioFile( dataFile.content().
+					firstChildElement().firstChildElement().
+					firstChildElement().attribute( "src" ) );
 		m_userLfoBtn->model()->setValue( true );
+		m_params->m_lfoWaveModel.setValue(EnvelopeAndLfoParameters::UserDefinedWave);
 		_de->accept();
+		update();
 	}
 }