CecTray: don't use lazy loading for the main controller, but pass the instance. bugzi...

[deb_libcec.git] / src / LibCecTray / Program.cs

diff --git a/src/LibCecTray/Program.cs b/src/LibCecTray/Program.cs
index c0a6a3a5ee5da5ff1c4434fdabcc384b42a597e7..3ab9cf7317e7d5f6a9827768d720ecf4c5f1bdf1 100644 (file)
--- a/src/LibCecTray/Program.cs
+++ b/src/LibCecTray/Program.cs
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libCEC(R) library.
  *
- * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited.  All rights reserved.
  * libCEC(R) is an original work, containing original code.
  *
  * libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -42,7 +42,15 @@ namespace LibCECTray
     private static CECTray _instance;
     public static CECTray Instance
     {
-      get { return _instance ?? (_instance = new CECTray()); }
+      get
+      {
+        if (_instance == null)
+        {
+          _instance = new CECTray();
+          _instance.Initialise();
+        }
+        return _instance;
+      }
     }
 
     [STAThread]