Fixes non-touch UserImages issue

- fixed wrong frame count when scanning GCI
4dsystems · Jan 25, 2024 · 109610a · 109610a
1 parent 3422278
commit 109610a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/gfx4desp32.cpp b/src/gfx4desp32.cpp
@@ -1536,9 +1536,11 @@ void gfx4desp32::_Open4dGFX(String file4d, bool scan) {
             tuih[n] = (GCIread() << 8) + GCIread();
         if (!(scan))
             cdv[n] = GCIread();
-        GCIread(); // dummy read to move pointer
-        if (!(scan))
+        int frms = GCIread();
+        if (!(scan)) gciobjframes[n] = 0;
+        if (frms != 0 && !(scan)) {
             gciobjframes[n] = (GCIread() << 8) + GCIread();
+        }
     }
 }
 
@@ -2013,6 +2015,10 @@ void gfx4desp32::UserImages(uint16_t uisnb, int16_t framenb) {
     if (framenb > (gciobjframes[uisnb] - 1) || framenb < 0) {
         outofrange(tuix[uisnb], tuiy[uisnb], tuiw[uisnb], tuih[uisnb]);
     }
+    else {
+        DrawWidget(tuiIndex[uisnb], tuix[uisnb], tuiy[uisnb], tuiw[uisnb], tuih[uisnb], framenb, 0,
+            true, cdv[uisnb]);
+    }
     ScrollEnable(setemp);
 }
 

diff --git a/src/gfx4desp32_touch.cpp b/src/gfx4desp32_touch.cpp
@@ -241,9 +241,11 @@ void gfx4desp32_touch::_Open4dGFX(String file4d, bool scan) {
       tuih[n] = (GCIread() << 8) + GCIread();
     if (!(scan))
       cdv[n] = GCIread();
-    /*int coldepth = */GCIread();
-    if (!(scan))
+    int frms = GCIread();
+    if (!(scan)) gciobjframes[n] = 0;
+    if (frms != 0 && !(scan)) {
       gciobjframes[n] = (GCIread() << 8) + GCIread();
+    }
   }
 }