[Lmuse-cvs-traffic] muse/muse/midiedit dcanvas.cpp,1.27,1.28 drumedit.cpp,1.39,1.40

[werner s. <wsc...@us...>]

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

Modified Files:
	dcanvas.cpp drumedit.cpp 
Log Message:
fixes


Index: drumedit.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/drumedit.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** drumedit.cpp	26 May 2005 10:52:21 -0000	1.39
--- drumedit.cpp	26 May 2005 16:01:16 -0000	1.40
***************
*** 370,373 ****
--- 370,375 ----
              connect(mc, SIGNAL(drumMapChanged(DrumMap*)), canvas, SLOT(setDrumMap(DrumMap*)));
              drumMap = mc->drumMap();
+             if (drumMap == 0)
+                   drumMap = &noDrumMap;
              dlist->setDrumMap(drumMap);
              ((DrumCanvas*)canvas)->setDrumMap(drumMap);
***************
*** 412,415 ****
--- 414,419 ----
              connect(mc, SIGNAL(drumMapChanged(DrumMap*)), canvas, SLOT(setDrumMap(DrumMap*)));
              drumMap = mc->drumMap();
+             if (drumMap == 0)
+                   drumMap = &noDrumMap;
              dlist->setDrumMap(drumMap);
              ((DrumCanvas*)canvas)->setDrumMap(drumMap);

Index: dcanvas.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/dcanvas.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** dcanvas.cpp	26 May 2005 10:52:21 -0000	1.27
--- dcanvas.cpp	26 May 2005 16:01:15 -0000	1.28
***************
*** 789,792 ****
--- 789,796 ----
  void DrumCanvas::setDrumMap(DrumMap* m)
        {
+       if (m == 0) {
+             printf("DrumCanvas:setDrumMap(0)!\n");
+             abort();
+             }
        drumMap = m;
        update();