From 08658e20e3dc2d33ee00940d6187d94a8b1bda3c Mon Sep 17 00:00:00 2001
From: Alexander Eckart <brunzel@gmx.li>
Date: Fri, 22 Feb 2013 17:11:25 +0100
Subject: [PATCH] added Base object to XMLReader class

the Base object handling must be changed for the whole VocaluxeLib!
---
 Vocaluxe/Base/CCover.cs        | 4 ++--
 Vocaluxe/Program.cs            | 1 +
 VocaluxeLib/Menu/CXMLReader.cs | 9 ++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Vocaluxe/Base/CCover.cs b/Vocaluxe/Base/CCover.cs
index 66b8f8c5..5e0eb7a4 100644
--- a/Vocaluxe/Base/CCover.cs
+++ b/Vocaluxe/Base/CCover.cs
@@ -163,7 +163,7 @@ namespace Vocaluxe.Base
 
             foreach (string file in files)
             {
-                CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(path, file));
+                CXMLReader xmlReader = new CXMLReader((Path.Combine(path, file)));
 
                 if (xmlReader != null)
                 {
@@ -194,7 +194,7 @@ namespace Vocaluxe.Base
             if (coverTheme.Name != String.Empty)
             {
 
-                CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.sFolderCover, coverTheme.File));
+                CXMLReader xmlReader = new CXMLReader((Path.Combine(CSettings.sFolderCover, coverTheme.File)));
 
                 if (xmlReader != null)
                 {
diff --git a/Vocaluxe/Program.cs b/Vocaluxe/Program.cs
index 90e583d8..4fdf26fa 100644
--- a/Vocaluxe/Program.cs
+++ b/Vocaluxe/Program.cs
@@ -38,6 +38,7 @@ namespace Vocaluxe
             {
                 // Init Log
                 CLog.Init();
+                CXMLReader.Base = CMain.Base;
 
                 CSettings.CreateFolders();
                 Application.DoEvents();
diff --git a/VocaluxeLib/Menu/CXMLReader.cs b/VocaluxeLib/Menu/CXMLReader.cs
index 1d6284c3..4bbb229a 100644
--- a/VocaluxeLib/Menu/CXMLReader.cs
+++ b/VocaluxeLib/Menu/CXMLReader.cs
@@ -7,8 +7,9 @@ namespace Vocaluxe.Menu
 {
     public class CXMLReader
     {
+        public static Basic Base;
         private XPathNavigator _Navigator;
-
+        
         public CXMLReader(string uri)
         {
             XPathDocument xPathDoc = new XPathDocument(uri);
@@ -20,7 +21,7 @@ namespace Vocaluxe.Menu
             get { return _Navigator; }
         }
 
-        public static CXMLReader OpenFile(string sUri)
+        public CXMLReader OpenFile(string sUri)
         {
             try
             {
@@ -28,7 +29,9 @@ namespace Vocaluxe.Menu
             }
             catch (Exception)
             {
-                //TODO: How to log from here?
+                if (Base != null)
+                    Base.Log.LogError("Can't open XML file: " + sUri);
+
                 return null;
             }
         }