From c4eed17a2e806dae0d2580f68e273b53c5bad9cd Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 26 Aug 2017 09:39:59 +1000 Subject: Fix a problem with gwinImage where an animated GIF can leave a running timer when it is destroyed. --- changelog.txt | 3 +++ src/gwin/gwin_image.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 4bc85283..b44253db 100644 --- a/changelog.txt +++ b/changelog.txt @@ -44,6 +44,9 @@ FIX: Fixed to allow gwinSetText with static text on a TextEdit control FIX: Fixed to ChibiOS realloc on a TextEdit control FEATURE: Added support for CMSIS V2.0 operating systems (eg RTX5) REMOVED: Removed long deprecated functions gfxSemCounter() and gfxSemCounterI() +FIX: gwinDetachToggle() is now a visible part of the API +CHANGE: Update OSX makefiles (allows for 64bit building) +FIX: Fixed resetting a timer on gwinImage objects when using animated GIFs *** Release 2.7 *** diff --git a/src/gwin/gwin_image.c b/src/gwin/gwin_image.c index 900e7f61..b1da7d52 100644 --- a/src/gwin/gwin_image.c +++ b/src/gwin/gwin_image.c @@ -19,6 +19,10 @@ #define gw ((GImageObject *)gh) static void ImageDestroy(GWindowObject *gh) { + // Stop the timer + #if GWIN_NEED_IMAGE_ANIMATION + gtimerStop(&gobj->timer); + #endif if (gdispImageIsOpen(&gw->image)) gdispImageClose(&gw->image); } @@ -129,7 +133,7 @@ GHandle gwinGImageCreate(GDisplay *g, GImageObject *gobj, GWindowInit *pInit) { #if GWIN_NEED_IMAGE_ANIMATION gtimerInit(&gobj->timer); #endif - + gwinSetVisible((GHandle)gobj, pInit->show); return (GHandle)gobj; -- cgit v1.2.3