From d94cae36d3e53814684864b3f4a8017180d643f5 Mon Sep 17 00:00:00 2001
From: lordjaxom <lordjaxom>
Date: Sat, 15 Jan 2005 21:02:40 +0000
Subject: - fixed last language initialization

---
 status.c    | 6 ++----
 status.h    | 5 ++---
 text2skin.c | 4 +++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/status.c b/status.c
index 36008d1..32be887 100644
--- a/status.c
+++ b/status.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: status.c,v 1.6 2005/01/11 18:10:39 lordjaxom Exp $
+ * $Id: status.c,v 1.7 2005/01/15 21:02:40 lordjaxom Exp $
  */
  
 #include "status.h"
@@ -8,7 +8,6 @@
 const std::string ReplayNames[__REPLAY_COUNT__] =
 	{ "", "normal", "mp3", "mplayer", "dvd", "vcd", "image" };
 
-cText2SkinStatus *cText2SkinStatus::mStatus = NULL;
 cText2SkinStatus Text2SkinStatus;
 
 cText2SkinStatus::cText2SkinStatus(void): 
@@ -19,9 +18,8 @@ cText2SkinStatus::cText2SkinStatus(void):
 		mRecordings(),
 		mCurrentRecording(0),
 		mNextRecording(0),
-		mLastLanguage(Setup.OSDLanguage)
+		mLastLanguage(0)
 {
-	mStatus = this;
 }
 
 void cText2SkinStatus::SetRender(cText2SkinRender *Render)
diff --git a/status.h b/status.h
index 643ebd8..84278d4 100644
--- a/status.h
+++ b/status.h
@@ -1,5 +1,5 @@
 /*
- * $Id: status.h,v 1.4 2005/01/11 18:10:39 lordjaxom Exp $
+ * $Id: status.h,v 1.5 2005/01/15 21:02:40 lordjaxom Exp $
  */
  
 #ifndef VDR_TEXT2SKIN_STATUS_H
@@ -33,8 +33,6 @@ public:
 	typedef std::vector<tRecordingInfo> tRecordings;
 
 private:
-	static cText2SkinStatus *mStatus;
-
 	cText2SkinRender *mRender;
 	eReplayMode       mReplayMode;
 	bool              mReplayIsLoop;
@@ -52,6 +50,7 @@ protected:
 public:
 	cText2SkinStatus(void);
 
+	void SetLanguage(int Language) { mLastLanguage = Language; }
 	void SetRender(cText2SkinRender *Render);
 
 	cxType GetTokenData(const txToken &Token);
diff --git a/text2skin.c b/text2skin.c
index 91133fb..5e314cd 100644
--- a/text2skin.c
+++ b/text2skin.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: text2skin.c,v 1.3 2005/01/05 19:31:39 lordjaxom Exp $
+ * $Id: text2skin.c,v 1.4 2005/01/15 21:02:40 lordjaxom Exp $
  */
 
 #include "text2skin.h"
@@ -11,6 +11,7 @@
 #include "menu.h"
 #include "i18n.h"
 #include "loader.h"
+#include "status.h"
 
 const char *cText2SkinPlugin::VERSION        = "1.0-rc1";
 const char *cText2SkinPlugin::SKINVERSION    = "1.0";
@@ -24,6 +25,7 @@ cText2SkinPlugin::~cText2SkinPlugin() {
 
 bool cText2SkinPlugin::Start(void) {
 	RegisterI18n(Phrases);
+	Text2SkinStatus.SetLanguage(Setup.OSDLanguage);
 	cText2SkinLoader::Start();
 	return true;
 }
-- 
cgit v1.2.3