Fixed plugin init sequence

1 files changed, 6 insertions, 3 deletions

diff --git a/xineliboutput.c b/xineliboutput.c
index 5d4eafce..8f0a0a45 100644
--- a/xineliboutput.c
+++ b/xineliboutput.c
@@ -21,7 +21,7 @@
  *
  * xineliboutput.c: VDR Plugin interface
  *
- * $Id: xineliboutput.c,v 1.54 2012-03-19 11:07:52 phintuka Exp $
+ * $Id: xineliboutput.c,v 1.55 2012-03-24 09:25:53 phintuka Exp $
  *
  */
 
@@ -87,7 +87,7 @@ cPluginXinelibOutput::cPluginXinelibOutput(void)
   // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
   // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
 
-  m_Dev = &(cXinelibDevice::Instance());
+  m_Dev = NULL;
 }
 
 cPluginXinelibOutput::~cPluginXinelibOutput()
@@ -171,6 +171,8 @@ bool cPluginXinelibOutput::Initialize(void)
   // Initialize any background activities the plugin shall perform.
   TRACEF("cPluginXinelibOutput::Initialize");
 
+  m_Dev = &(cXinelibDevice::Instance());
+
   return m_Dev ? m_Dev->InitDevice() : false;
 }
 
@@ -178,6 +180,7 @@ bool cPluginXinelibOutput::Start(void)
 {
   // Start any background activities the plugin shall perform.
   TRACEF("cPluginXinelibOutput::Start");
+
   return m_Dev ? m_Dev->StartDevice() : false;
 }
 
@@ -222,7 +225,7 @@ cOsdObject *cPluginXinelibOutput::MainMenuAction(void)
   if (xc.hide_main_menu)
     return NULL;
 
-  return new cMenuXinelib(m_Dev);
+  return m_Dev ? new cMenuXinelib(m_Dev) : NULL;
 }
 
 cMenuSetupPage *cPluginXinelibOutput::SetupMenu(void)