empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix segfault when selecting a different iface.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2021-04-23 20:09:00 +01:00
parent 5dd8e39787
commit e3c4fe6ebf
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/frontends/sdl/imgui/sdlsettings.cpp
View file

@ -557,30 +557,37 @@ namespace sa2
standardLabelText("Status", tfe_enabled ? "enabled" : "disabled");
if (ImGui::BeginCombo("Interface", static_cast<const char *>(get_tfe_interface())))
{
std::vector<char *> ifaces;
if (tfe_enumadapter_open())
{
char *pname;
char *pdescription;
while (tfe_enumadapter(&pname, &pdescription))
{
ifaces.push_back(pname);
lib_free(pdescription);
}
tfe_enumadapter_close();
for (const auto & iface : ifaces)
{
// must call it each time
// as update_tfe_interface() will invalidate it
const char * current = static_cast<const char *>(get_tfe_interface());
const bool isSelected = strcmp(pname, current) == 0;
if (ImGui::Selectable(pname, isSelected))
const bool isSelected = strcmp(iface, current) == 0;
if (ImGui::Selectable(iface, isSelected))
{
update_tfe_interface(pname, nullptr);
RegSaveString(TEXT(REG_CONFIG), TEXT(REGVALUE_UTHERNET_INTERFACE), 1, pname);
// the following line interacts with tfe_enumadapter, so we must run it outside the above loop
update_tfe_interface(iface, nullptr);
RegSaveString(TEXT(REG_CONFIG), TEXT(REGVALUE_UTHERNET_INTERFACE), 1, iface);
}
if (isSelected)
{
ImGui::SetItemDefaultFocus();
}
lib_free(pname);
lib_free(pdescription);
lib_free(iface);
}
tfe_enumadapter_close();
}
ImGui::EndCombo();
}