ardour/livetrax
13
0
Fork 0
Code

Fix stuck connection block when template load fails.

Browse Source 
Session::new_route_from_template() unconditionally calls
IO::disable_connecting(), and needs to be reverted likewise
(no RAII here).
This commit is contained in:
Robin Gareus 2018-11-26 21:45:06 +01:00
parent dce81aecc5
commit 5531a440c9
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/session.cc
View File

@ -3451,6 +3451,11 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i
goto out; goto out;
} }
catch (...) {
IO::enable_connecting ();
throw;
}
--how_many; --how_many;
} }
@ -3462,9 +3467,10 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i
} else { } else {
add_routes (ret, true, true, false, insert_at); add_routes (ret, true, true, false, insert_at);
} }
IO::enable_connecting ();
} }
IO::enable_connecting ();
return ret; return ret;
} }