Changeset 1565

Timestamp:

02/19/10 21:55:18 (3 years ago)

Author:

wolke

Message:

fix small left sample object problem.
after loading layers out of MAX_LAYERS range we lost sample objects.

Files:

• trunk/gui/src/InstrumentEditor/InstrumentEditor.cpp (modified) (6 diffs)

trunk/gui/src/InstrumentEditor/InstrumentEditor.cpp

@@ -626 +626 @@
 
         int selectedLayer =  m_nSelectedLayer;
+        int firstselection = selectedLayer;
         
         
@@ -633 +634 @@
                 for(int i=2;i < filename.size();++i) 
                 {
-                        if( i-2 >= MAX_LAYERS ) break;
+                        selectedLayer = m_nSelectedLayer + i - 2;
+                        if( ( i-2 >= MAX_LAYERS ) || ( selectedLayer + 1  > MAX_LAYERS ) ) break;
 
                         Sample *newSample = Sample::load( filename[i] );
@@ -648 +650 @@
                                 at m_nSelectedLayer and the next layer at m_nSelectedLayer+1
                         */
-                        
-                        selectedLayer = m_nSelectedLayer + i - 2;
-
                         
                         H2Core::InstrumentLayer *pLayer = pInstr->get_layer( selectedLayer );
@@ -668 +667 @@
                         if ( fnc ){
                                 QString newfilename = filename[i].section( '/', -1 );
-                                        newfilename.replace( "." + newfilename.section( '.', -1 ), "");
+                                newfilename.replace( "." + newfilename.section( '.', -1 ), "");
                                 m_pInstrument->set_name( newfilename );
                         }
@@ -685 +684 @@
 
         selectedInstrumentChangedEvent();    // update all
+        selectLayer( firstselection );
         m_pLayerPreview->updateAll();
 }
@@ -744 +744 @@
                 return;
         }
-
         m_nSelectedLayer = nLayer;