history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-05-03 19:35:41 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

pad: remove unreachable code block in DoState

Browse Source 
The block in question was introduced by changesets:
  47f0720b936
  125d104df4f
This commit is contained in:
Jake Stine 2021-02-14 11:01:06 -08:00
parent 4c3d2cd3fe
commit 6449207e04
1 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/pad.cpp
View File

@ -66,8 +66,6 @@ bool Pad::DoState(StateWrapper& sw)
if (g_settings.load_devices_from_save_states)
{
if (controller_type != state_controller_type)
{
if (g_settings.load_devices_from_save_states)
{
g_host_interface->AddFormattedOSDMessage(
10.0f,
@ -85,25 +83,6 @@ bool Pad::DoState(StateWrapper& sw)
}
}
else
{
g_host_interface->AddFormattedOSDMessage(
10.0f,
g_host_interface->TranslateString("OSDMessage", "Ignoring mismatched controller type %s in port %u."),
Settings::GetControllerTypeName(state_controller_type), i + 1u);
// we still need to read the save state controller state
if (state_controller_type != ControllerType::None)
{
std::unique_ptr<Controller> dummy_controller = Controller::Create(state_controller_type, i);
if (dummy_controller)
{
if (!sw.DoMarker("Controller") || !dummy_controller->DoState(sw, true))
return false;
}
}
}
}
else
{
if (m_controllers[i])
{