[Lmuse-cvs-traffic] muse/muse midieditor.cpp,1.5,1.6

[Mathias L. <lun...@us...>]

Update of /cvsroot/lmuse/muse/muse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10566/muse

Modified Files:
	midieditor.cpp 
Log Message:
bugfix for readStatus when no previous setting in settingslist

Index: midieditor.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midieditor.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** midieditor.cpp	24 Aug 2004 17:40:11 -0000	1.5
--- midieditor.cpp	24 Aug 2004 18:52:03 -0000	1.6
***************
*** 99,107 ****
  
        Xml::Token token = xml.parse();
-       printf("MidiEditor::readStatus\n");
        settings->readStatus(xml);
        //QString tag = xml.s1(); //Skip first line, since "settings" is already instance of correct class
        // replace with previous part config:
        int part = selPart();
        if (part == -1) { //Just a (perhaps a bit too rigorous) errorcheck
              printf("MidiEditor::readStatus, internal error: part not found (-1)\n");
--- 99,107 ----
  
        Xml::Token token = xml.parse();
        settings->readStatus(xml);
        //QString tag = xml.s1(); //Skip first line, since "settings" is already instance of correct class
        // replace with previous part config:
        int part = selPart();
+ 
        if (part == -1) { //Just a (perhaps a bit too rigorous) errorcheck
              printf("MidiEditor::readStatus, internal error: part not found (-1)\n");
***************
*** 109,113 ****
        else { //OK
              delete startSettings;
!             startSettings = song->settingsList()->get(editorType + part)->clone();//(etype | sel);
              initSettings();
              }
--- 109,119 ----
        else { //OK
              delete startSettings;
!             SettingsList* l = song->settingsList();
!             EditorSettings* prevSettings = l->get(editorType + part);//(etype | sel);
! 
!             if (!prevSettings)
!                   startSettings = newDefaultSettings();
!             else
!                   startSettings = prevSettings->clone();
              initSettings();
              }
***************
*** 324,332 ****
              }
        if (!prevSettings) {
!             printf("MidiEditor::getSettings - creating new default settings.\n");
              startSettings = newDefaultSettings();
              }
        else {
!             printf("MidiEditor::getSettings - cloning previous configuration.\n");
              startSettings = prevSettings->clone(); //Keeps the original configuration intact, for deletion when replaced
              }
--- 330,338 ----
              }
        if (!prevSettings) {
!             //printf("MidiEditor::getSettings - creating new default settings.\n");
              startSettings = newDefaultSettings();
              }
        else {
!             //printf("MidiEditor::getSettings - cloning previous configuration.\n");
              startSettings = prevSettings->clone(); //Keeps the original configuration intact, for deletion when replaced
              }