changes in cSetupEEPG

4 files changed, 8 insertions, 3 deletions

diff --git a/eepg.c b/eepg.c
index 2ed8f2f..7cfb745 100644
--- a/eepg.c
+++ b/eepg.c
@@ -119,7 +119,7 @@ public:
 
 cMenuSetupPremiereEpg::cMenuSetupPremiereEpg (void)
 {
-  data = SetupPE;
+  data = *cSetupEEPG::getInstance();
   SetSection (tr ("PremiereEPG"));
   optDisp[0] = tr ("off");
   for (unsigned int i = 1; i < NUM_PATS; i++) {
diff --git a/log.h b/log.h
index c771d5f..1a0e88f 100644
--- a/log.h
+++ b/log.h
@@ -20,7 +20,7 @@
 bool CheckLevel(int level)
 {
 #ifdef DEBUG
-  if (cSetupEEPG::getInstance().LogLevel >= level)
+  if (cSetupEEPG::getInstance()->LogLevel >= level)
 #else
   if (VERBOSE >= level)
 #endif
diff --git a/setupeepg.c b/setupeepg.c
index 4c6693d..4d9471e 100644
--- a/setupeepg.c
+++ b/setupeepg.c
@@ -5,10 +5,13 @@
  *      Author: d.petrovski
  */
 
+#include <stddef.h>
 #include "setupeepg.h"
 
 // --- cSetupEEPG -------------------------------------------------------
 
+cSetupEEPG* cSetupEEPG::_setupEEPG = NULL;
+
 cSetupEEPG::cSetupEEPG (void)
 {
   OptPat = 1;
diff --git a/setupeepg.h b/setupeepg.h
index 7441223..ef1ad2a 100644
--- a/setupeepg.h
+++ b/setupeepg.h
@@ -26,7 +26,9 @@ public:
 
 private:
   cSetupEEPG (void);
-  cSetupEEPG* _setupEEPG;
+  cSetupEEPG(cSetupEEPG const&){};             // copy constructor is private
+  cSetupEEPG& operator=(cSetupEEPG const&){};  // assignment operator is private
+  static cSetupEEPG* _setupEEPG;
 
 };