valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Track and free unassigned CStickBindGroup allocations

Browse source
This commit is contained in:
krcroft 2020-03-20 20:42:29 -07:00 • committed by Patryk Obara
parent a1a3e0203d
commit 99e53a830f
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gui/sdl_mapper.cpp
View file

@ -864,6 +864,7 @@ protected:
Uint8 old_hat_state[16];
bool is_dummy;
};
std::list<CStickBindGroup *> stickbindgroups;
class C4AxisBindGroup : public CStickBindGroup {
public:
@ -2469,27 +2470,28 @@ static void CreateBindGroups(void) {
break;
case JOY_4AXIS:
mapper.sticks.stick[mapper.sticks.num_groups++]=new C4AxisBindGroup(joyno,joyno);
new CStickBindGroup(joyno+1U,joyno+1U,true);
stickbindgroups.push_back(new CStickBindGroup(joyno+1U,joyno+1U,true));
break;
case JOY_4AXIS_2:
mapper.sticks.stick[mapper.sticks.num_groups++]=new C4AxisBindGroup(joyno+1U,joyno);
new CStickBindGroup(joyno,joyno+1U,true);
stickbindgroups.push_back(new CStickBindGroup(joyno,joyno+1U,true));
break;
case JOY_FCS:
mapper.sticks.stick[mapper.sticks.num_groups++]=new CFCSBindGroup(joyno,joyno);
new CStickBindGroup(joyno+1U,joyno+1U,true);
stickbindgroups.push_back(new CStickBindGroup(joyno+1U,joyno+1U,true));
break;
case JOY_CH:
mapper.sticks.stick[mapper.sticks.num_groups++]=new CCHBindGroup(joyno,joyno);
new CStickBindGroup(joyno+1U,joyno+1U,true);
stickbindgroups.push_back(new CStickBindGroup(joyno+1U,joyno+1U,true));
break;
case JOY_2AXIS:
default:
mapper.sticks.stick[mapper.sticks.num_groups++]=new CStickBindGroup(joyno,joyno);
if((joyno+1U) < mapper.sticks.num) {
delete mapper.sticks.stick[mapper.sticks.num_groups];
mapper.sticks.stick[mapper.sticks.num_groups++]=new CStickBindGroup(joyno+1U,joyno+1U);
} else {
new CStickBindGroup(joyno+1U,joyno+1U,true);
stickbindgroups.push_back(new CStickBindGroup(joyno+1U,joyno+1U,true));
}
break;
}
@ -2618,6 +2620,10 @@ static void MAPPER_Destroy(Section *sec) {
delete ptr;
keybindgroups.clear();
for (auto & ptr : stickbindgroups)
delete ptr;
stickbindgroups.clear();
// Free any allocated sticks
for (int i = 0; i < MAXSTICKS; ++i) {
delete mapper.sticks.stick[i];