diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-08-12 16:45:06 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-08-12 16:45:06 +1000 |
| commit | 5460a923ab25d27e522fe175563633665c477e02 (patch) | |
| tree | e43734965f66092d3d076a599b3b8a188b005bc0 /src/gwin/frame.c | |
| parent | 0e74c164c3eac14f6e99d1a5cc4e0563faeff5d0 (diff) | |
| parent | 10902154aec652a3fcdf028b2c6ff16743464973 (diff) | |
| download | uGFX-5460a923ab25d27e522fe175563633665c477e02.tar.gz uGFX-5460a923ab25d27e522fe175563633665c477e02.tar.bz2 uGFX-5460a923ab25d27e522fe175563633665c477e02.zip | |
Merge branch 'master' into newmouse
Diffstat (limited to 'src/gwin/frame.c')
| -rw-r--r-- | src/gwin/frame.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gwin/frame.c b/src/gwin/frame.c index c10aaea3..3f41c69f 100644 --- a/src/gwin/frame.c +++ b/src/gwin/frame.c @@ -38,8 +38,10 @@ static coord_t BorderSizeT(GHandle gh) { return (gh->flags & GWIN_FRAME_BORDER) static void _frameDestroy(GHandle gh) { /* Deregister the button callback */ - geventRegisterCallback(&gh2obj->gl, NULL, NULL); - geventDetachSource(&gh2obj->gl, NULL); + if ((gh->flags & (GWIN_FRAME_CLOSE_BTN|GWIN_FRAME_MINMAX_BTN))) { + geventRegisterCallback(&gh2obj->gl, NULL, NULL); + geventDetachSource(&gh2obj->gl, NULL); + } /* call the gcontainer standard destroy routine */ _gcontainerDestroy(gh); |