From 58af6e03e9388aa9f681958880f6dbccac796606 Mon Sep 17 00:00:00 2001
From: BPanther <bpanther_ts@hotmail.com>
Date: Mon, 14 Aug 2023 22:59:47 +0200
Subject: [PATCH] nglcd: changed last commit

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/1850d91f715fcafbdc8ca311152b05ead969f6a1
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2023-08-14 (Mon, 14 Aug 2023)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/driver/glcd/glcd.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/driver/glcd/glcd.cpp b/src/driver/glcd/glcd.cpp
index 235b31350..b49a14bf6 100644
--- a/src/driver/glcd/glcd.cpp
+++ b/src/driver/glcd/glcd.cpp
@@ -1021,8 +1021,8 @@ void cGLCD::Run(void)
 						Channel = g_Locale->getText(LOCALE_GLCD_VOLUME);
 						ChannelWidth = font_channel.Width(Channel);
 						doScrollChannel = ChannelWidth > bitmap->Width();
-						scrollChannelSkip = 0;
 						scrollChannelForward = true;
+						scrollChannelSkip = 0;
 						if (doScrollChannel) {
 							scrollChannelOffset = bitmap->Width()/4;
 							ChannelWidth += scrollChannelOffset;
@@ -1031,8 +1031,8 @@ void cGLCD::Run(void)
 							scrollChannelOffset = 0;
 					}
 					EpgWidth = 0;
-					scrollEpgSkip = 0;
 					scrollEpgForward = true;
+					scrollEpgSkip = 0;
 					Scale = g_settings.current_volume;
 					channel_id = -1;
 				}
@@ -1045,8 +1045,8 @@ void cGLCD::Run(void)
 					Epg = stagingEpg;
 					EpgWidth = font_epg.Width(Epg);
 					doScrollEpg = EpgWidth > bitmap->Width();
-					scrollEpgSkip = 0;
 					scrollEpgForward = true;
+					scrollEpgSkip = 0;
 					if (doScrollEpg)
 					{
 						scrollEpgOffset = bitmap->Width()/4;
@@ -1060,8 +1060,8 @@ void cGLCD::Run(void)
 					Channel = stagingChannel;
 					ChannelWidth = font_channel.Width(Channel);
 					doScrollChannel = ChannelWidth > bitmap->Width();
-					scrollChannelSkip = 0;
 					scrollChannelForward = true;
+					scrollChannelSkip = 0;
 					if (doScrollChannel)
 					{
 						scrollChannelOffset = bitmap->Width()/4;
@@ -1171,13 +1171,16 @@ void cGLCD::Run(void)
 #if 0 // FIXME: scroll problem, high load
 					doScrollEpg = EpgWidth > bitmap->Width();
 					scrollEpgForward = true;
+#else
+					doScrollEpg = false;
+					scrollEpgForward = false;
+#endif
 					scrollEpgSkip = 0;
 					if (doScrollEpg)
 					{
 						scrollEpgOffset = bitmap->Width()/4;
 						EpgWidth += scrollEpgOffset;
 					} else
-#endif
 						scrollEpgOffset = 0;
 				}
 			}