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

Merge pull request #6737 from JosJuice/qt-invalid-si-device 

DolphinQt2: Don't crash on invalid SI devices
This commit is contained in:
Mat M 2018-05-03 13:07:23 -04:00 committed by GitHub
parent 3270fadb0d 16b805410f
commit cf40ebf16a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/DolphinQt2/Config/ControllersWindow.cpp
View File

@ -19,6 +19,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <map> #include <map>
#include <optional>
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
@ -42,16 +43,17 @@ static const std::map<SerialInterface::SIDevices, int> s_gc_types = {
{SerialInterface::SIDEVICE_DANCEMAT, 4}, {SerialInterface::SIDEVICE_GC_TARUKONGA, 5}, {SerialInterface::SIDEVICE_DANCEMAT, 4}, {SerialInterface::SIDEVICE_GC_TARUKONGA, 5},
{SerialInterface::SIDEVICE_GC_GBA, 6}, {SerialInterface::SIDEVICE_GC_KEYBOARD, 7}}; {SerialInterface::SIDEVICE_GC_GBA, 6}, {SerialInterface::SIDEVICE_GC_KEYBOARD, 7}};
static int ToGCMenuIndex(const SerialInterface::SIDevices sidevice) static std::optional<int> ToGCMenuIndex(const SerialInterface::SIDevices sidevice)
{ {
return s_gc_types.at(sidevice); auto it = s_gc_types.find(sidevice);
return it != s_gc_types.end() ? it->second : std::optional<int>();
} }
static SerialInterface::SIDevices FromGCMenuIndex(const int menudevice) static std::optional<SerialInterface::SIDevices> FromGCMenuIndex(const int menudevice)
{ {
auto it = std::find_if(s_gc_types.begin(), s_gc_types.end(), auto it = std::find_if(s_gc_types.begin(), s_gc_types.end(),
[=](auto pair) { return pair.second == menudevice; }); [=](auto pair) { return pair.second == menudevice; });
return it->first; return it != s_gc_types.end() ? it->first : std::optional<SerialInterface::SIDevices>();
} }
ControllersWindow::ControllersWindow(QWidget* parent) : QDialog(parent) ControllersWindow::ControllersWindow(QWidget* parent) : QDialog(parent)
@ -460,7 +462,9 @@ void ControllersWindow::LoadSettings()
{ {
for (size_t i = 0; i < m_wiimote_groups.size(); i++) for (size_t i = 0; i < m_wiimote_groups.size(); i++)
{ {
m_gc_controller_boxes[i]->setCurrentIndex(ToGCMenuIndex(SConfig::GetInstance().m_SIDevice[i])); const std::optional<int> gc_index = ToGCMenuIndex(SConfig::GetInstance().m_SIDevice[i]);
if (gc_index)
m_gc_controller_boxes[i]->setCurrentIndex(*gc_index);
m_wiimote_boxes[i]->setCurrentIndex(g_wiimote_sources[i]); m_wiimote_boxes[i]->setCurrentIndex(g_wiimote_sources[i]);
} }
m_wiimote_real_balance_board->setChecked(g_wiimote_sources[WIIMOTE_BALANCE_BOARD] == m_wiimote_real_balance_board->setChecked(g_wiimote_sources[WIIMOTE_BALANCE_BOARD] ==
@ -501,7 +505,9 @@ void ControllersWindow::SaveSettings()
for (size_t i = 0; i < m_gc_groups.size(); i++) for (size_t i = 0; i < m_gc_groups.size(); i++)
{ {
const int index = m_gc_controller_boxes[i]->currentIndex(); const int index = m_gc_controller_boxes[i]->currentIndex();
SConfig::GetInstance().m_SIDevice[i] = FromGCMenuIndex(index); const std::optional<SerialInterface::SIDevices> si_device = FromGCMenuIndex(index);
if (si_device)
SConfig::GetInstance().m_SIDevice[i] = *si_device;
m_gc_buttons[i]->setEnabled(index != 0 && index != 6); m_gc_buttons[i]->setEnabled(index != 0 && index != 6);
} }
SConfig::GetInstance().SaveSettings(); SConfig::GetInstance().SaveSettings();