summaryrefslogtreecommitdiff
path: root/libs/ardour/location_importer.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2008-12-18 19:31:00 +0000
committerCarl Hetherington <carl@carlh.net>2008-12-18 19:31:00 +0000
commit4e1f451520975868659f4c00d00883f5f1cd5805 (patch)
tree7a8a51d65d70932e8151bbbeafc8eae49e60cd65 /libs/ardour/location_importer.cc
parentbe655cc5af1b059de77bb4215c13f14013fc73da (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/location_importer.cc')
-rw-r--r--libs/ardour/location_importer.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/ardour/location_importer.cc b/libs/ardour/location_importer.cc
index f321c1d2cb..58a6e72f16 100644
--- a/libs/ardour/location_importer.cc
+++ b/libs/ardour/location_importer.cc
@@ -95,7 +95,7 @@ LocationImporter::LocationImporter (XMLTree const & source, Session & session, L
LocationImporter::~LocationImporter ()
{
- if (!queued() && location) {
+ if (!queued()) {
delete location;
}
}
@@ -178,10 +178,8 @@ LocationImporter::_prepare_move ()
void
LocationImporter::_cancel_move ()
{
- if (location) {
- delete location;
- location = 0;
- }
+ delete location;
+ location = 0;
}
void