summaryrefslogtreecommitdiff
path: root/libs/ardour/route.cc
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/route.cc')
-rw-r--r--libs/ardour/route.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 4b96dc8a93..26dde851c6 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -2274,10 +2274,7 @@ Route::_set_state (const XMLNode& node, bool call_base)
nlist = node.children();
- if (deferred_state) {
- delete deferred_state;
- }
-
+ delete deferred_state;
deferred_state = new XMLNode(X_("deferred state"));
/* set parent class properties before anything else */
@@ -2521,10 +2518,8 @@ Route::set_control_outs (const vector<string>& ports)
vector<string>::const_iterator i;
size_t limit;
- if (_control_outs) {
- delete _control_outs;
- _control_outs = 0;
- }
+ delete _control_outs;
+ _control_outs = 0;
if (is_control() || is_master()) {
/* no control outs for these two special busses */