nglcd: changed last commit

Duckbox-Developers · Aug 13, 2023 · 0869afb · 0869afb
1 parent ade9812
commit 0869afb
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/driver/nglcd.cpp b/src/driver/nglcd.cpp
@@ -785,8 +785,8 @@ void nGLCD::Run(void)
 					Channel = g_Locale->getText(LOCALE_GLCD_VOLUME);
 					ChannelWidth = font_channel.Width(Channel);
 					doScrollChannel = ChannelWidth > bitmap->Width() - 4;
-					scrollChannelSkip = 0;
 					scrollChannelForward = true;
+					scrollChannelSkip = 0;
 					if (doScrollChannel)
 					{
 						scrollChannelOffset = bitmap->Width() / g_settings.glcd_scroll_speed;
@@ -809,8 +809,8 @@ void nGLCD::Run(void)
 					Epg = stagingEpg;
 					EpgWidth = font_epg.Width(Epg);
 					doScrollEpg = EpgWidth > bitmap->Width() - 4;
-					scrollEpgSkip = 0;
 					scrollEpgForward = true;
+					scrollEpgSkip = 0;
 					if (doScrollEpg)
 					{
 						scrollEpgOffset = bitmap->Width() / g_settings.glcd_scroll_speed;
@@ -824,8 +824,8 @@ void nGLCD::Run(void)
 					Channel = stagingChannel;
 					ChannelWidth = font_channel.Width(Channel);
 					doScrollChannel = ChannelWidth > bitmap->Width() - 4;
-					scrollChannelSkip = 0;
 					scrollChannelForward = true;
+					scrollChannelSkip = 0;
 					if (doScrollChannel)
 					{
 						scrollChannelOffset = bitmap->Width() / g_settings.glcd_scroll_speed;
@@ -906,14 +906,17 @@ void nGLCD::Run(void)
 #if 0 // FIXME: scroll problem, high load
 					doScrollEpg = EpgWidth > bitmap->Width() - 4;
 					scrollEpgForward = true;
+#else
+					doScrollEpg = false;
+					scrollEpgForward = false;
+#endif
 					scrollEpgSkip = 0;
 					if (doScrollEpg)
 					{
 						scrollEpgOffset = bitmap->Width() / g_settings.glcd_scroll_speed;
 						EpgWidth += scrollEpgOffset;
 					}
 					else
-#endif
 						scrollEpgOffset = 0;
 				}