uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Fix a problem with gwinImage where an animated GIF can leave a running timer when it is destroyed.

Browse Source
This commit is contained in:
inmarket 2017-08-26 09:39:59 +10:00
parent 9f5a716344
commit c4eed17a2e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.txt
View File

@ -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 FIX: Fixed to ChibiOS realloc on a TextEdit control
FEATURE: Added support for CMSIS V2.0 operating systems (eg RTX5) FEATURE: Added support for CMSIS V2.0 operating systems (eg RTX5)
REMOVED: Removed long deprecated functions gfxSemCounter() and gfxSemCounterI() 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 *** *** Release 2.7 ***

6
src/gwin/gwin_image.c
View File

@ -19,6 +19,10 @@
#define gw ((GImageObject *)gh) #define gw ((GImageObject *)gh)
static void ImageDestroy(GWindowObject *gh) { static void ImageDestroy(GWindowObject *gh) {
// Stop the timer
#if GWIN_NEED_IMAGE_ANIMATION
gtimerStop(&gobj->timer);
#endif
if (gdispImageIsOpen(&gw->image)) if (gdispImageIsOpen(&gw->image))
gdispImageClose(&gw->image); gdispImageClose(&gw->image);
} }
@ -129,7 +133,7 @@ GHandle gwinGImageCreate(GDisplay *g, GImageObject *gobj, GWindowInit *pInit) {
#if GWIN_NEED_IMAGE_ANIMATION #if GWIN_NEED_IMAGE_ANIMATION
gtimerInit(&gobj->timer); gtimerInit(&gobj->timer);
#endif #endif
gwinSetVisible((GHandle)gobj, pInit->show); gwinSetVisible((GHandle)gobj, pInit->show);
return (GHandle)gobj; return (GHandle)gobj;