From 8f9e76ca422b4182672aeb870d208e0881ca20f6 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 16 Jan 2014 08:51:39 +0100
Subject: [PATCH] db/upnp: remove redundant m_root nullptr checks

---
 src/db/UpnpDatabasePlugin.cxx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/db/UpnpDatabasePlugin.cxx b/src/db/UpnpDatabasePlugin.cxx
index 257797d1a..48dff67ae 100644
--- a/src/db/UpnpDatabasePlugin.cxx
+++ b/src/db/UpnpDatabasePlugin.cxx
@@ -163,9 +163,6 @@ UpnpDatabase::Configure(const config_param &, Error &)
 bool
 UpnpDatabase::Open(Error &error)
 {
-	if (m_root)
-		return true;
-
 	m_lib = LibUPnP::getLibUPnP(error);
 	if (!m_lib)
 		return false;
@@ -186,8 +183,7 @@ UpnpDatabase::Open(Error &error)
 void
 UpnpDatabase::Close()
 {
-	if (m_root)
-		delete m_root;
+	delete m_root;
 	// TBD decide what we do with the lib and superdir objects
 }