fixed bug that dynamic viewelemnts in main menu were not drawn if menu was closed and opened again

4 files changed, 26 insertions, 0 deletions

diff --git a/coreengine/viewdisplaymenu.c b/coreengine/viewdisplaymenu.c
index 6a9db57..07de9fe 100644
--- a/coreengine/viewdisplaymenu.c
+++ b/coreengine/viewdisplaymenu.c
@@ -1084,6 +1084,7 @@ cViewMenuMain::~cViewMenuMain() {
 
 void cViewMenuMain::ClearVariables(void) {
     init = true;
+    lastDrawDynamic = 0;
 }
 
 void cViewMenuMain::SetViewElements(void) {
diff --git a/coreengine/viewelementscommon.c b/coreengine/viewelementscommon.c
index 411a1d8..d004daa 100644
--- a/coreengine/viewelementscommon.c
+++ b/coreengine/viewelementscommon.c
@@ -205,6 +205,7 @@ void cVeDevices::Init(void) {
 void cVeDevices::Close(void) {
     devices.clear();
     initial = true;
+    lastRefresh = 0;
     numDevices = 0;
     mutexDevices.Lock();
     delete[] lastSignalStrength;
diff --git a/coreengine/viewelementsdisplaymenu.c b/coreengine/viewelementsdisplaymenu.c
index eb73023..cd2b8fc 100644
--- a/coreengine/viewelementsdisplaymenu.c
+++ b/coreengine/viewelementsdisplaymenu.c
@@ -630,6 +630,11 @@ cVeDmSystemload::cVeDmSystemload(void) {
 cVeDmSystemload::~cVeDmSystemload(void) {
 }
 
+void cVeDmSystemload::Close(void) {
+    Reset();
+    cViewElement::Close();
+}
+
 void cVeDmSystemload::SetTokenContainer(void) {
     tokenContainer = new skindesignerapi::cTokenContainer();
     tokenContainer->DefineStringToken("{load}", (int)eDMSystemloadST::load);
@@ -684,6 +689,11 @@ cVeDmSystemmemory::cVeDmSystemmemory(void) {
 cVeDmSystemmemory::~cVeDmSystemmemory(void) {
 }
 
+void cVeDmSystemmemory::Close(void) {
+    Reset();
+    cViewElement::Close();
+}
+
 void cVeDmSystemmemory::SetTokenContainer(void) {
     tokenContainer = new skindesignerapi::cTokenContainer();
     tokenContainer->DefineIntToken("{totalmem}", (int)eDMSystemmemoryIT::totalmem);
@@ -730,6 +740,11 @@ cVeDmTemperatures::cVeDmTemperatures(void) {
 cVeDmTemperatures::~cVeDmTemperatures(void) {
 }
 
+void cVeDmTemperatures::Close(void) {
+    Reset();
+    cViewElement::Close();
+}
+
 void cVeDmTemperatures::SetTokenContainer(void) {
     tokenContainer = new skindesignerapi::cTokenContainer();
     tokenContainer->DefineIntToken("{cputemp}", (int)eDMTemperaturesIT::cputemp);
@@ -795,6 +810,11 @@ cVeDmVdrstatistics::cVeDmVdrstatistics(void) {
 cVeDmVdrstatistics::~cVeDmVdrstatistics(void) {
 }
 
+void cVeDmVdrstatistics::Close(void) {
+    Reset();
+    cViewElement::Close();
+}
+
 void cVeDmVdrstatistics::SetTokenContainer(void) {
     tokenContainer = new skindesignerapi::cTokenContainer();
     tokenContainer->DefineStringToken("{vdrcpu}", (int)eDMVdrstatisticsST::vdrcpu);
diff --git a/coreengine/viewelementsdisplaymenu.h b/coreengine/viewelementsdisplaymenu.h
index b64954c..26cbbc9 100644
--- a/coreengine/viewelementsdisplaymenu.h
+++ b/coreengine/viewelementsdisplaymenu.h
@@ -125,6 +125,7 @@ private:
 public:
     cVeDmSystemload(void);
     virtual ~cVeDmSystemload(void);
+    void Close(void);
     void Reset(void) { lastSystemLoad = -1.0f; }
     void SetTokenContainer(void);
     bool Parse(bool forced = false);
@@ -139,6 +140,7 @@ private:
 public:
     cVeDmSystemmemory(void);
     virtual ~cVeDmSystemmemory(void);
+    void Close(void);
     void Reset(void) { lastMemUsage = -1; }
     void SetTokenContainer(void);
     bool Parse(bool forced = false);
@@ -154,6 +156,7 @@ private:
 public:
     cVeDmTemperatures(void);
     virtual ~cVeDmTemperatures(void);
+    void Close(void);
     void Reset(void) { lastCpuTemp = -1; lastGpuTemp = -1; }
     void SetTokenContainer(void);
     bool Parse(bool forced = false);
@@ -169,6 +172,7 @@ private:
 public:
     cVeDmVdrstatistics(void);
     virtual ~cVeDmVdrstatistics(void);
+    void Close(void);
     void Reset(void) { lastVdrCPU = "undefined"; lastVdrMEM = "undefined"; }
     void SetTokenContainer(void);
     bool Parse(bool forced = false);