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/drumkitloader.cc | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'src/drumkitloader.cc')

diff --git a/src/drumkitloader.cc b/src/drumkitloader.cc
index c997dfb..79d000a 100644
--- a/src/drumkitloader.cc
+++ b/src/drumkitloader.cc
@@ -36,6 +36,7 @@ DrumKitLoader::DrumKitLoader(DrumGizmo *dg)
   drumgizmo = dg;
   is_done = false;
   quitit = false;
+  skipit = false;
 }
 
 DrumKitLoader::~DrumKitLoader()
@@ -52,6 +53,13 @@ void DrumKitLoader::stop()
   wait_stop();
 }
 
+void DrumKitLoader::skip()
+{
+  skipit = true;
+  semaphore.post();
+  skip_semaphore.wait();
+}
+
 bool DrumKitLoader::isDone()
 {
   bool done;
@@ -74,8 +82,6 @@ void DrumKitLoader::loadKit(DrumKit *kit)
   semaphore.post();
 }
 
-
-
 void DrumKitLoader::thread_main()
 {
   while(1) {
@@ -86,6 +92,12 @@ void DrumKitLoader::thread_main()
 
     if(quitit) return;
 
+    if(skipit) {
+      skip_semaphore.post();
+      skipit = false;
+      continue;
+    }
+
     unsigned int count = 0;
 
     if(kit && !kit->isValid()) goto finish;
@@ -133,7 +145,7 @@ void DrumKitLoader::thread_main()
           
           a++;
 
-          if(quitit) return;
+          if(skipit) goto finish;
         }
         
         i++;
-- 
cgit v1.2.3