Made CXMLReader.OpenFile private so factory method has to be used

VocaluxeLib/Menu/CMenu.cs

@@ -172,27 +172,16 @@ namespace Vocaluxe.Menu
         {
             string file = Path.Combine(XmlPath, _ThemeName + ".xml");
 
-            CXMLReader xmlReader = null;
-            
-            try
-            {
-                xmlReader = new CXMLReader(file);
-            }
-            catch (Exception e)
-            {
-                if (xmlReader != null)
-                    xmlReader = null;
-
-                CBase.Log.LogError("Error loading theme file " + file + ": " + e.Message);
-            }
+            CXMLReader xmlReader = CXMLReader.OpenFile(file);
+            if (xmlReader == null)
+                return;
 
             bool VersionCheck = false;
-            if (xmlReader != null)
-                VersionCheck = CheckVersion(_ScreenVersion, xmlReader);
+            VersionCheck = CheckVersion(_ScreenVersion, xmlReader);
 
             int SkinIndex = CBase.Theme.GetSkinIndex(_PartyModeID);
 
-            if (xmlReader != null && VersionCheck && SkinIndex != -1)
+            if (VersionCheck && SkinIndex != -1)
             {
                 _ThemePath = XmlPath;
                 LoadThemeBasics(xmlReader, SkinIndex);

VocaluxeLib/Menu/CXMLReader.cs

@@ -9,7 +9,8 @@ namespace Vocaluxe.Menu
     {
         private XPathNavigator _Navigator;
         
-        public CXMLReader(string uri)
+        //Private method. Use OpenFile factory method to get an instance
+        private CXMLReader(string uri)
         {
             XPathDocument xPathDoc = new XPathDocument(uri);
             _Navigator = xPathDoc.CreateNavigator();
@@ -26,9 +27,9 @@ namespace Vocaluxe.Menu
             {
                 return new CXMLReader(sUri);
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                CBase.Log.LogError("Can't open XML file: " + sUri);
+                CBase.Log.LogError("Can't open XML file: " + sUri + ": " + e.Message);
                 return null;
             }
         }