aboutsummaryrefslogtreecommitdiffstats
path: root/src/gwin/gwin_image.c
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@embedded.pro>2017-08-27 13:43:53 +0200
committerJoel Bodenmann <joel@embedded.pro>2017-08-27 13:43:53 +0200
commit285c6528e65c3fa9a898e03b261fcaf8121308cd (patch)
tree0895be81ed272a7e32bb1ed4df273a488ccce8ed /src/gwin/gwin_image.c
parentf9494c44a2406b4b7dd753076f1dfc8380e19500 (diff)
parentdb7971734fc940851b6d91a77a60906622f6c491 (diff)
downloaduGFX-285c6528e65c3fa9a898e03b261fcaf8121308cd.tar.gz
uGFX-285c6528e65c3fa9a898e03b261fcaf8121308cd.tar.bz2
uGFX-285c6528e65c3fa9a898e03b261fcaf8121308cd.zip
Merge branch 'master' of git.ugfx.io:uGFX/uGFX
Diffstat (limited to 'src/gwin/gwin_image.c')
-rw-r--r--src/gwin/gwin_image.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gwin/gwin_image.c b/src/gwin/gwin_image.c
index 900e7f61..855eecc9 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(&gw->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;