1 files changed, 13 insertions, 5 deletions
diff --git a/vdr.c b/vdr.c
index 5c82372..d1f8c4a 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.198 2005/01/06 14:36:40 kls Exp $
+ * $Id: vdr.c 1.200 2005/01/14 16:50:39 kls Exp $
  */
 
 #include <getopt.h>
@@ -412,7 +412,10 @@ int main(int argc, char *argv[])
         }
      else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')
         EpgDirectory = VideoDirectory;
-     cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
+     if (EpgDirectory)
+        cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
+     else
+        cSchedules::SetEpgDataFileName(EpgDataFileName);
      cSchedules::Read();
      }
 
@@ -460,15 +463,20 @@ int main(int argc, char *argv[])
 
   Interface = new cInterface(SVDRPport);
 
+  // Default skins:
+
+  new cSkinClassic;
+  new cSkinSTTNG;
+  Skins.SetCurrent(Setup.OSDSkin);
+  cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());
+
   // Start plugins:
 
   if (!PluginManager.StartPlugins())
      EXIT(2);
 
-  // Skins:
+  // Set skin and theme in case they're implemented by a plugin:
 
-  new cSkinClassic;
-  new cSkinSTTNG;
   Skins.SetCurrent(Setup.OSDSkin);
   cThemes::Load(Skins.Current()->Name(), Setup.OSDTheme, Skins.Current()->Theme());