Remove component from instrument when remmoving last layer

jask80 · Nov 8, 2014 · a7637e6 · a7637e6
1 parent d984dfa
commit a7637e6
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/gui/src/InstrumentEditor/InstrumentEditor.cpp b/src/gui/src/InstrumentEditor/InstrumentEditor.cpp
@@ -708,6 +708,16 @@ void InstrumentEditor::buttonClicked( Button* pButton )
 				m_pInstrument->get_component(m_nSelectedComponent)->set_layer( NULL, m_nSelectedLayer );
 				delete pLayer;
 			}
+
+			int p_count = 0;
+			for( int n = 0; n < MAX_LAYERS; n++ ) {
+                InstrumentLayer* layer = m_pInstrument->get_component(m_nSelectedComponent)->get_layer( n );
+                if( layer )
+                    p_count++;
+            }
+
+            if( p_count == 0 )
+                m_pInstrument->get_components()->erase( m_pInstrument->get_components()->begin() + m_nSelectedComponent );
 		}
 		AudioEngine::get_instance()->unlock();
 		selectedInstrumentChangedEvent();    // update all