From 2d47656d0dfddea80c04bcf48b3b9c36de784af1 Mon Sep 17 00:00:00 2001
From: methodus <methodus@web.de>
Date: Mon, 22 Oct 2012 12:27:15 +0200
Subject: Fixed segfault, if database connection failed

---
 media/mediaManager.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'media')

diff --git a/media/mediaManager.cpp b/media/mediaManager.cpp
index 4820a01..a2eeb36 100644
--- a/media/mediaManager.cpp
+++ b/media/mediaManager.cpp
@@ -573,9 +573,13 @@ bool cMediaManager::Initialise(){
     }
 
   } catch (const std::exception& e) {
-    esyslog("UPnP\tException occurred while initializing database '%s': %s", databaseFile.c_str(), e.what());
 
-    connection.rollbackTransaction();
+    if(!connection){
+      esyslog("UPnP\tException occurred while connecting to database '%s': %s", databaseFile.c_str(), e.what());
+    } else {
+      esyslog("UPnP\tException occurred while initializing database '%s': %s", databaseFile.c_str(), e.what());
+      connection.rollbackTransaction();
+    }
 
     return false;
   }
-- 
cgit v1.2.3