# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1476193003 -3600
# Node ID ac1e4634479b4daee0659eedffed0501fa8ec127
# Parent  5909d5d25733f49c6f19f67e7a87c05bade82b2c
Ensure finish() can be called even if not configured (otherwise there's no way to dispose of the plugin)

diff -r 5909d5d25733 -r ac1e4634479b vamp-server/server.cpp
--- a/vamp-server/server.cpp	Tue Oct 11 14:36:18 2016 +0100
+++ b/vamp-server/server.cpp	Tue Oct 11 14:36:43 2016 +0100
@@ -230,14 +230,21 @@
 
     case RRType::Finish:
     {
-	response.finishResponse.plugin = request.finishRequest.plugin;
-	response.finishResponse.features =
-	    request.finishRequest.plugin->getRemainingFeatures();
+	auto &freq = request.finishRequest;
+	response.finishResponse.plugin = freq.plugin;
+
+	auto h = mapper.pluginToHandle(freq.plugin);
+        // Finish can be called (to unload the plugin) even if the
+        // plugin has never been configured or used. But we want to
+        // make sure we call getRemainingFeatures only if we have
+        // actually configured the plugin.
+	if (mapper.isConfigured(h)) {
+            response.finishResponse.features = freq.plugin->getRemainingFeatures();
+	}
 
 	// We do not delete the plugin here -- we need it in the
-	// mapper when converting the features. It gets deleted by the
-	// caller.
-	
+	// mapper when converting the features. It gets deleted in the
+	// calling function.
 	response.success = true;
 	break;
     }