diff options
| author | svntcreutz <svntcreutz@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f> | 2007-08-12 16:14:01 +0000 |
|---|---|---|
| committer | svntcreutz <svntcreutz@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f> | 2007-08-12 16:14:01 +0000 |
| commit | 17a409e09424c615721f550f1868f5c9879d1437 (patch) | |
| tree | 79a4a27843a0a0d73508eee7f160f9d4998a59db /src/menuorg.cpp | |
| parent | 6c4114fee6496e6bd5e20b44ede7cb5443ece10a (diff) | |
| download | vdr-plugin-menuorg-17a409e09424c615721f550f1868f5c9879d1437.tar.gz vdr-plugin-menuorg-17a409e09424c615721f550f1868f5c9879d1437.tar.bz2 | |
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
Diffstat (limited to 'src/menuorg.cpp')
| -rw-r--r-- | src/menuorg.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
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) |