From 55680c9cd62d35e8687f53c923a3e0c775000581 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 24 Aug 2016 01:34:21 +0100
Subject: potencial null ref

---
 OpenSim/Server/Base/ServicesServerBase.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Server/Base/ServicesServerBase.cs')

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 1f2c54d..a7cffd7 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -139,10 +139,12 @@ namespace OpenSim.Server.Base
                 startupConfig = Config.Configs["Startup"];
             }
 
-            ConfigDirectory = startupConfig.GetString("ConfigDirectory", ".");
-
-            prompt = startupConfig.GetString("Prompt", prompt);
+            if (startupConfig != null)
+            {
+                ConfigDirectory = startupConfig.GetString("ConfigDirectory", ".");
 
+                prompt = startupConfig.GetString("Prompt", prompt);
+            }
             // Allow derived classes to load config before the console is opened.
             ReadConfig();
 
-- 
cgit v1.1