ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix config file when removing system accels. 

We assign the `NOOP` id for every command disabled by the user, but not
the command name (just `NOOP`). When updating the configuration file,
any command with `NOOP` id is valid, even if the label does not match
`NOOP`. Hence this weird issue.

- Fix #502.
This commit is contained in:
Edênis Freindorfer Azevedo 2019-09-13 14:18:04 -03:00 committed by Rafael Kitover
parent 1c6b016853
commit 10f5576ecf
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wx/opts.cpp
View File

@ -803,6 +803,11 @@ void update_opts()
if (cmdtab[cmd].cmd_id == cmd_id) if (cmdtab[cmd].cmd_id == cmd_id)
break; break;
// NOOP overwrittes commands removed by the user
wxString command = cmdtab[cmd].cmd;
if (cmdtab[cmd].cmd_id == XRCID("NOOP"))
command = wxT("NOOP");
wxAcceleratorEntry_v::iterator j; wxAcceleratorEntry_v::iterator j;
for (j = i + 1; j < gopts.accels.end(); ++j) for (j = i + 1; j < gopts.accels.end(); ++j)
@ -812,8 +817,8 @@ void update_opts()
wxAcceleratorEntry_v nv(i, j); wxAcceleratorEntry_v nv(i, j);
wxString nvs = wxKeyTextCtrl::ToString(nv); wxString nvs = wxKeyTextCtrl::ToString(nv);
if (nvs != cfg->Read(cmdtab[cmd].cmd)) if (nvs != cfg->Read(command))
cfg->Write(cmdtab[cmd].cmd, nvs); cfg->Write(command, nvs);
} }
cfg->SetPath(wxT("/")); cfg->SetPath(wxT("/"));