From aef7434f9d5a86950b27a15b9a4ce6dcb13bb26e Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Mon, 9 Feb 2026 19:07:56 +0100
Subject: [PATCH] avr: minor fixes in screensaver code.

---
 avr/modules/lcd2/gui2/generic/screensaver.asm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/avr/modules/lcd2/gui2/generic/screensaver.asm b/avr/modules/lcd2/gui2/generic/screensaver.asm
index d9c936c..f55f177 100644
--- a/avr/modules/lcd2/gui2/generic/screensaver.asm
+++ b/avr/modules/lcd2/gui2/generic/screensaver.asm
@@ -100,8 +100,16 @@ ScreenSaver_Enter:
     pop zh
   pop zl
   bigcall Widget_GetSdramPtr                 ; Y:=SDRAM data for widget (none)
+  cp xl, zl
+  brne ScreenSaver_Enter_store
+  cp xh, zh
+  breq ScreenSaver_Enter_ret
+ScreenSaver_Enter_store:
   std Y+SCREENSAVER_SD_OFFS_PREV_VIEW_LO, xl
   std Y+SCREENSAVER_SD_OFFS_PREV_VIEW_HI, xh
+  clr r16
+  std Y+SCREENSAVER_SD_OFFS_TIMER_LO, r16
+  std Y+SCREENSAVER_SD_OFFS_TIMER_HI, r16
   
   push zl
     push zh
@@ -115,6 +123,7 @@ ScreenSaver_Enter:
   
   clr r16
   bigcall Display_SetBacklight
+ScreenSaver_Enter_ret:
   ret
 ; @end
 
@@ -146,7 +155,7 @@ ScreenSaver_Leave:
       bigcall GuiApp_ShowView
     pop zh
   pop zl
-
+  
   ldi r16, 0xff
   bigcall Display_SetBacklight
   ret