diff options
| author | Carl Hetherington <carl@carlh.net> | 2008-12-18 19:31:00 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2008-12-18 19:31:00 +0000 |
| commit | 4e1f451520975868659f4c00d00883f5f1cd5805 (patch) | |
| tree | 7a8a51d65d70932e8151bbbeafc8eae49e60cd65 /libs/ardour/route.cc | |
| parent | be655cc5af1b059de77bb4215c13f14013fc73da (diff) | |
Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite/freestore-mgmt.html#faq-16.8 Apologies for the big commit.
git-svn-id: svn://localhost/ardour2/branches/3.0@4332 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 11 |
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 */ |