From 17a409e09424c615721f550f1868f5c9879d1437 Mon Sep 17 00:00:00 2001
From: svntcreutz <svntcreutz@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>
Date: Sun, 12 Aug 2007 16:14:01 +0000
Subject: fixed crash in ProcessArgs() function

git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5697 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
---
 src/menuorg.cpp | 13 +++++++++----
 src/xmlmenu.cpp |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/menuorg.cpp b/src/menuorg.cpp
index 4ffa928..dfa03c0 100644
--- a/src/menuorg.cpp
+++ b/src/menuorg.cpp
@@ -90,11 +90,13 @@ bool MenuOrgPlugin::ProcessArgs(int argc, char *argv[])
         switch (optionChar)
         {
             case 'c':
-                configFile = optarg;
+                if(optarg)
+                    configFile = optarg;
                 break;
 
             case 's':
-                schemaFile = optarg;
+                if(optarg)
+                     schemaFile = optarg;
                 break;
 
             default:
@@ -109,8 +111,11 @@ bool MenuOrgPlugin::Initialize(void)
 {
     XmlMenu xmlMenu;
 
-    configFile = (string) ConfigDirectory() + "/menuorg.xml";
-    schemaFile = (string) ConfigDirectory() + "/menuorg.dtd";
+    if(configFile.empty())
+        configFile = (string) ConfigDirectory() + "/menuorg.xml";
+
+    if(schemaFile.empty())
+        schemaFile = (string) ConfigDirectory() + "/menuorg.dtd";
 
     MenuNode* menu = xmlMenu.LoadXmlMenu(configFile, schemaFile);
     if (menu)
diff --git a/src/xmlmenu.cpp b/src/xmlmenu.cpp
index 99581c1..f4e36c4 100644
--- a/src/xmlmenu.cpp
+++ b/src/xmlmenu.cpp
@@ -38,7 +38,7 @@ MenuNode* XmlMenu::LoadXmlMenu(string menuFileName, string schemaFileName)
 
     try
     {
-        dsyslog("loading menuorg config file from %s and schema from %s",menuFileName, schemaFileName);
+        dsyslog("loading menuorg config file from %s and schema from %s",menuFileName.data(), schemaFileName.data());
 
         DomParser parser;
         parser.set_substitute_entities(); //We just want the text to be resolved/unescaped automatically.
-- 
cgit v1.2.3