Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leak in djui panel

This commit is contained in:
MysterD 2023-03-31 23:54:26 -07:00
parent 3966e13a05
commit a6575cd9a8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pc/djui/djui_panel.c
View File

@ -42,7 +42,6 @@ struct DjuiPanel* djui_panel_add(struct DjuiBase* caller, struct DjuiThreePanel*
// calculate 3panel body height
djui_three_panel_recalculate_body_size(threePanel);
// allocate panel
struct DjuiPanel* panel = calloc(1, sizeof(struct DjuiPanel));
panel->parent = sPanelList;
@ -149,17 +148,21 @@ void djui_panel_update(void) {
if (panel->on_panel_destroy) {
panel->on_panel_destroy(NULL);
}
if (activeBase == removingBase) { activeBase = NULL; }
if (parentBase == removingBase) { parentBase = NULL; }
djui_base_destroy(removingBase);
free(panel);
removingBase = NULL;
return;
}
}
if (removingBase != NULL) {
if (activeBase && removingBase) {
activeBase->y.value = moveMax - moveMax * smoothstep(0, moveMax, sMoveAmount);
if (sPanelRemoving != NULL) {
if (sPanelRemoving) {
removingBase->y.value = activeBase->y.value - 1.0f;
}
} else if (parentBase != NULL) {
} else if (activeBase && parentBase) {
activeBase->y.value = moveMax * smoothstep(0, moveMax, sMoveAmount) - moveMax;
parentBase->y.value = activeBase->y.value + moveMax;
}