1 files changed, 4 insertions, 3 deletions
diff --git a/server/server.cpp b/server/server.cpp
index acfe7a1..95e7f16 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -179,6 +179,7 @@ bool cMediaServer::Initialize(){
   }
 
   mWebserver = new cWebserver(GetServerIPAddress());
+  mMediaManager = new cMediaManager();
 
   if(mCurrentConfiguration.expertSettings){
 
@@ -204,12 +205,12 @@ bool cMediaServer::Initialize(){
       mWebserver->SetPresentationUrl(ss.str());
     }
 
-
     if(mCurrentConfiguration.webServerPort)
       mWebserver->SetListenerPort(mCurrentConfiguration.webServerPort);
-  }
 
-  mMediaManager = new cMediaManager();
+    if(!mCurrentConfiguration.databaseFile.empty())
+      mMediaManager->SetDatabaseFile(mCurrentConfiguration.databaseFile);
+  }
 
   ret = UpnpSetMaxContentLength(GetMaxContentLength());