From 0fb98518ead7d664e352bf6c90a4db86489de5ff Mon Sep 17 00:00:00 2001
From: lumapu <lp@lufami.de>
Date: Sun, 14 Jan 2024 16:30:01 +0100
Subject: [PATCH] 0.8.55 * merge PR: fix reboot problem with deactivated power
 graph #1360

---
 src/CHANGES.md                     | 3 +++
 src/defines.h                      | 2 +-
 src/plugins/Display/Display_Mono.h | 7 +++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/CHANGES.md b/src/CHANGES.md
index 6b3d0f80..e65fca23 100644
--- a/src/CHANGES.md
+++ b/src/CHANGES.md
@@ -1,5 +1,8 @@
 # Development Changes
 
+## 0.8.55 - 2024-01-14
+* merge PR: fix reboot problem with deactivated power graph #1360
+
 ## 0.8.54 - 2024-01-13
 * added minimal version (without: MqTT, Display, History), WebUI is not changed!
 * added simulator (must be activated before compile, standard: off)
diff --git a/src/defines.h b/src/defines.h
index 4dcead16..975abb58 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       8
-#define VERSION_PATCH       54
+#define VERSION_PATCH       55
 
 //-------------------------------------
 typedef struct {
diff --git a/src/plugins/Display/Display_Mono.h b/src/plugins/Display/Display_Mono.h
index e480baf0..1e34be87 100644
--- a/src/plugins/Display/Display_Mono.h
+++ b/src/plugins/Display/Display_Mono.h
@@ -18,7 +18,6 @@
 #endif
 #include "../../utils/helper.h"
 #include "Display_data.h"
-#include "config/settings.h"
 #include "../../utils/dbg.h"
 #include "../../utils/timemonitor.h"
 
@@ -185,7 +184,7 @@ class DisplayMono {
         }
 
         void addPowerGraphEntry(float val) {
-            if ((mPgData != nullptr) && (mDisplayData->utcTs > 0)) {  // precondition: power graph initialized and utc time available
+            if ((nullptr != mPgData) && (mDisplayData->utcTs > 0)) {  // precondition: power graph initialized and utc time available
                 calcPowerGraphValues();
                 //mPgData[mPgLastPos] = std::max(mPgData[mPgLastPos], (uint8_t) (val * 255.0 / mPgMaxAvailPower));  // normalizing of data to 0-255
                 mPgData[mPgLastPos] = std::max(mPgData[mPgLastPos], val);
@@ -206,7 +205,7 @@ class DisplayMono {
         }
 
         void plotPowerGraph(uint8_t xoff, uint8_t yoff) {
-            if (mPgData == nullptr)  // power graph not initialized
+            if (nullptr == mPgData)  // power graph not initialized
                 return;
 
             // draw axes
@@ -214,7 +213,7 @@ class DisplayMono {
             mDisplay->drawLine(xoff, yoff, xoff + mPgWidth, yoff);              // horizontal axis
 
             // do not draw as long as time is not set correctly and no data was received
-            if ((mDisplayData->pGraphStartTime == 0) || (mDisplayData->pGraphEndTime == 0) || (mDisplayData->utcTs == 0) || (mPgMaxPwr < 1) || (mPgLastPos == 0))
+            if ((0 == mDisplayData->pGraphStartTime) || (0 == mDisplayData->pGraphEndTime) || (0 == mDisplayData->utcTs) || (mPgMaxPwr < 1) || (0 == mPgLastPos))
                 return;
 
             // draw X scale