merged with trunk (that is, pulled the fixes from release_2_0)

only quickly tested, seems okay on the first glance

1 files changed, 5 insertions, 3 deletions

diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp
index d024422c..bc8bbdb0 100644
--- a/muse2/muse/midiedit/dcanvas.cpp
+++ b/muse2/muse/midiedit/dcanvas.cpp
@@ -78,18 +78,18 @@ DEvent::DEvent(MusECore::Event e, MusECore::Part* p, int instr)
 //   addItem
 //---------------------------------------------------------
 
-void DrumCanvas::addItem(MusECore::Part* part, MusECore::Event& event)
+CItem* DrumCanvas::addItem(MusECore::Part* part, MusECore::Event& event)
       {
       if (signed(event.tick())<0) {
             printf("ERROR: trying to add event before current part!\n");
-            return;
+            return NULL;
       }
       
       int instr=pitch_and_track_to_instrument(event.pitch(), part->track());
       if (instr<0)
       {
         if (heavyDebugMsg) printf("trying to add event which is hidden or not in any part known to me\n");
-        return;
+        return NULL;
       }
       
       DEvent* ev = new DEvent(event, part, instr);
@@ -104,6 +104,8 @@ void DrumCanvas::addItem(MusECore::Part* part, MusECore::Event& event)
             //part = newPart;
             part->setLenTick(part->lenTick()+diff);
             }
+      
+      return ev;
       }
 
 //---------------------------------------------------------