zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ScreenPanels: free ScreenSettings of deleted screens

This commit is contained in:
Christian Göttsche 2021-12-08 14:44:48 +01:00
parent c9e0bd2002
commit c85e5bbf5c
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ScreensPanel.c
View File

@ -15,13 +15,22 @@ in the source distribution for its full text.
#include "FunctionBar.h" #include "FunctionBar.h"
#include "Hashtable.h" #include "Hashtable.h"
#include "ProvideCurses.h" #include "ProvideCurses.h"
#include "Settings.h"
#include "XUtils.h" #include "XUtils.h"
static void ScreenListItem_delete(Object* cast) {
ScreenListItem* this = (ScreenListItem*)cast;
if (this->ss) {
ScreenSettings_delete(this->ss);
}
ListItem_delete(cast);
}
ObjectClass ScreenListItem_class = { ObjectClass ScreenListItem_class = {
.extends = Class(ListItem), .extends = Class(ListItem),
.display = ListItem_display, .display = ListItem_display,
.delete = ListItem_delete, .delete = ScreenListItem_delete,
.compare = ListItem_compare .compare = ListItem_compare
}; };
@ -37,6 +46,14 @@ static const char* const ScreensFunctions[] = {" ", "Rename", " ", "
static void ScreensPanel_delete(Object* object) { static void ScreensPanel_delete(Object* object) {
Panel* super = (Panel*) object; Panel* super = (Panel*) object;
ScreensPanel* this = (ScreensPanel*) object; ScreensPanel* this = (ScreensPanel*) object;
/* do not delete screen settings still in use */
int n = Panel_size(super);
for (int i = 0; i < n; i++) {
ScreenListItem* item = (ScreenListItem*) Panel_get(super, i);
item->ss = NULL;
}
Panel_done(super); Panel_done(super);
free(this); free(this);
} }