From 3dcc42c508dd798b9034f77e6f83ec75e648936c Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Thu, 25 Apr 2013 21:43:48 +0200
Subject: Fix crash on 'load drumkit' while another drumkit is already loading.

---
 src/drumgizmo.cc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/drumgizmo.cc')

diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc
index b5e5c63..8ba45f5 100644
--- a/src/drumgizmo.cc
+++ b/src/drumgizmo.cc
@@ -145,6 +145,8 @@ bool DrumGizmo::loadkit(std::string file)
 
   DEBUG(drumgizmo, "loadkit(%s)\n", kitfile.c_str());
 
+  loader.skip();
+
   kit.clear();
 
   DrumKitParser parser(kitfile, kit);
@@ -288,7 +290,6 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
         continue;
       }
 
-#if 1
       if(i->group() != "") {
         // Add event to ramp down all existing events with the same groupname.
         Channels::iterator j = kit.channels.begin();
@@ -311,7 +312,6 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
           j++;
         }
       }
-#endif   
 
       Sample *s = i->sample(evs[e].velocity, evs[e].offset + pos);
       
@@ -348,7 +348,6 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
   //
   // Write audio
   //
-  
   for(size_t c = 0; c < kit.channels.size(); c++) {
     sample_t *buf = samples;
     bool internal = false;
@@ -356,9 +355,11 @@ bool DrumGizmo::run(size_t pos, sample_t *samples, size_t nsamples)
       buf = oe->getBuffer(c);
       internal = true;
     }
-    memset(buf, 0, nsamples * sizeof(sample_t));
-    getSamples(c, pos, buf, nsamples);
-    if(!internal) oe->run(c, samples, nsamples);
+    if(buf) {
+      memset(buf, 0, nsamples * sizeof(sample_t));
+      getSamples(c, pos, buf, nsamples);
+      if(!internal) oe->run(c, samples, nsamples);
+    }
   }
   
   ie->post();
-- 
cgit v1.2.3