From 28096a402947b05c7e923e075f926263a3279a42 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Thu, 22 Apr 2021 18:18:53 +0200
Subject: Fix crash when doing async-load in cli.

---
 drumgizmo/drumgizmoc.cc | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'drumgizmo/drumgizmoc.cc')

diff --git a/drumgizmo/drumgizmoc.cc b/drumgizmo/drumgizmoc.cc
index c6b43f0..cec96f7 100644
--- a/drumgizmo/drumgizmoc.cc
+++ b/drumgizmo/drumgizmoc.cc
@@ -326,6 +326,7 @@ int main(int argc, char* argv[])
 		        }
 		        oe = factory.createOutput(engine);
 		        if(ie == NULL)
+		        if(oe == NULL)
 		        {
 			        std::cerr << "Invalid output engine: " << engine << std::endl;
 			        return 1;
@@ -700,6 +701,34 @@ int main(int argc, char* argv[])
 		}
 		std::cout << "\ndone" << std::endl;
 	}
+	else
+	{
+		// Async loading in progress
+
+		// Wait until the loader has passed the kit parsing step before proceeding.
+		bool parsing_done{false};
+		while(!parsing_done)
+		{
+			std::this_thread::sleep_for(std::chrono::milliseconds(10));
+
+			switch(settings.drumkit_load_status.load())
+			{
+			case LoadStatus::Idle:
+			case LoadStatus::Parsing:
+				// Not yet past the parsing step
+				break;
+			case LoadStatus::Loading:
+			case LoadStatus::Done:
+				// Past parsing step
+				parsing_done = true;
+				break;
+			case LoadStatus::Error:
+				// Kit parser error?
+				std::cout << "\nFailed to load " << kitfile << std::endl;
+				return 1;
+			}
+		}
+	}
 
 	gizmo.setSamplerate(oe->getSamplerate());
 	oe->onLatencyChange(gizmo.getLatency());
-- 
cgit v1.2.3