From f76b94c277c34855579486851517d03c314c8fde Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 30 Dec 2013 21:46:21 +0000
Subject: Fix occasional crashes and deadlocks on exit.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5229 a436a847-0d15-0410-975c-d299462d15a1
---
 src/server/Engine.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/server/Engine.cpp')

diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index a7d77736..1f6fd70c 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -16,6 +16,8 @@
 
 #include <sys/mman.h>
 
+#include <limits>
+
 #include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h"
 
 #include "events/CreatePort.hpp"
@@ -95,6 +97,13 @@ Engine::~Engine()
 	_root_graph = NULL;
 	deactivate();
 
+	// Process all pending events
+	const FrameTime end = std::numeric_limits<FrameTime>::max();
+	_process_context.locate(_process_context.end(), end - _process_context.end());
+	_post_processor->set_end_time(end);
+	_pre_processor->process(_process_context, *_post_processor, false);
+	_post_processor->process();
+
 	const SPtr<Store> store = this->store();
 	if (store) {
 		for (auto& s : *store.get()) {
@@ -107,7 +116,6 @@ Engine::~Engine()
 
 	_world->set_store(SPtr<Ingen::Store>());
 
-	delete _maid;
 	delete _pre_processor;
 	delete _post_processor;
 	delete _block_factory;
@@ -115,6 +123,7 @@ Engine::~Engine()
 	delete _broadcaster;
 	delete _event_writer;
 	delete _worker;
+	delete _maid;
 
 	_driver.reset();
 
-- 
cgit v1.2.1