Core/Misc: Multiple static analysis issues fixed (small optimizations and clear code)

2 files changed, 2 insertions, 4 deletions

diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h
index 5548e44c925..61385d92437 100644
--- a/src/server/shared/Database/DatabaseWorkerPool.h
+++ b/src/server/shared/Database/DatabaseWorkerPool.h
@@ -76,13 +76,12 @@ class DatabaseWorkerPool
 
         bool Open(const std::string& infoString, uint8 async_threads, uint8 synch_threads)
         {
-            bool res = true;
             _connectionInfo = new MySQLConnectionInfo(infoString);
 
             TC_LOG_INFO("sql.driver", "Opening DatabasePool '%s'. Asynchronous connections: %u, synchronous connections: %u.",
                 GetDatabaseName(), async_threads, synch_threads);
 
-            res = OpenConnections(IDX_ASYNC, async_threads);
+            bool res = OpenConnections(IDX_ASYNC, async_threads);
 
             if (!res)
                 return res;
diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index abdf2a2cc3c..24290009625 100644
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -57,8 +57,7 @@ m_connectionFlags(CONNECTION_ASYNC)
 
 MySQLConnection::~MySQLConnection()
 {
-    if (m_worker)
-        delete m_worker;
+    delete m_worker;
 
     for (size_t i = 0; i < m_stmts.size(); ++i)
         delete m_stmts[i];