From 157161e48225e0ade5f626abdc293db2c5f9939d Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 18 Jun 2014 20:53:43 +0200 Subject: [PATCH] fix port-unregister (on failed latency measurement) --- libs/ardour/audioengine.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index d424300c49..8612f44b8a 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -1110,11 +1110,13 @@ AudioEngine::start_latency_detection (bool for_midi) const string portname ("latency_in"); if ((_latency_input_port = pe.register_port (portname, DataType::MIDI, IsInput)) == 0) { + pe.unregister_port (_latency_input_port); pe.unregister_port (_latency_output_port); stop (true); return -1; } if (pe.connect (_latency_input_name, make_port_name_non_relative (portname))) { + pe.unregister_port (_latency_input_port); pe.unregister_port (_latency_output_port); stop (true); return -1; @@ -1136,11 +1138,13 @@ AudioEngine::start_latency_detection (bool for_midi) const string portname ("latency_in"); if ((_latency_input_port = pe.register_port (portname, DataType::AUDIO, IsInput)) == 0) { + pe.unregister_port (_latency_input_port); pe.unregister_port (_latency_output_port); stop (true); return -1; } if (pe.connect (_latency_input_name, make_port_name_non_relative (portname))) { + pe.unregister_port (_latency_input_port); pe.unregister_port (_latency_output_port); stop (true); return -1; -- 2.30.2