diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-02-02 13:00:25 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-02-02 13:00:25 +0100 |
| commit | e178b08549bd0bf3e2a8d235518a60ea05681962 (patch) | |
| tree | 58091e888e7712a659f21e04258c6a49eca22442 /src/gwin/gwin.c | |
| parent | 3c99e6e67dfa9833e25ebd417ccbd45a2d4493f6 (diff) | |
| parent | 6515373b2a63a24b77ff20a26e9b18468f29a6f9 (diff) | |
| download | uGFX-e178b08549bd0bf3e2a8d235518a60ea05681962.tar.gz uGFX-e178b08549bd0bf3e2a8d235518a60ea05681962.tar.bz2 uGFX-e178b08549bd0bf3e2a8d235518a60ea05681962.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'src/gwin/gwin.c')
| -rw-r--r-- | src/gwin/gwin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index 9e0df7f8..a9d9d823 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -102,7 +102,7 @@ void _gwinInit(void) { GHandle _gwindowCreate(GDisplay *g, GWindowObject *pgw, const GWindowInit *pInit, const gwinVMT *vmt, uint16_t flags) { // Allocate the structure if necessary if (!pgw) { - if (!(pgw = (GWindowObject *)gfxAlloc(vmt->size))) + if (!(pgw = gfxAlloc(vmt->size))) return 0; pgw->flags = flags|GWIN_FLG_DYNAMIC; } else |