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 #6997 from spycrab/qt_gcadapter 

Qt: Fix using GC Adapter requiring restart
This commit is contained in:
spycrab 2018-05-28 03:20:32 +02:00 committed by GitHub
parent 18a31e12fd d0e2c353a0
commit cece179d77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "DolphinQt2/Config/ControllersWindow.h"
#include <QApplication>
#include <QBoxLayout>
#include <QCheckBox>
@ -29,13 +31,14 @@
#include "Core/IOS/IOS.h"
#include "Core/IOS/USB/Bluetooth/BTReal.h"
#include "Core/NetPlayProto.h"
#include "DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.h"
#include "DolphinQt2/Config/Mapping/MappingWindow.h"
#include "DolphinQt2/QtUtils/WrapInScrollArea.h"
#include "DolphinQt2/Settings.h"
#include "UICommon/UICommon.h"
#include "DolphinQt2/Config/ControllersWindow.h"
#include "InputCommon/GCAdapter.h"
#include "UICommon/UICommon.h"
static const std::map<SerialInterface::SIDevices, int> s_gc_types = {
{SerialInterface::SIDEVICE_NONE, 0}, {SerialInterface::SIDEVICE_GC_CONTROLLER, 1},
@ -523,5 +526,11 @@ void ControllersWindow::SaveSettings()
m_gc_buttons[i]->setEnabled(index != 0 && index != 6);
}
if (GCAdapter::UseAdapter())
GCAdapter::StartScanThread();
else
GCAdapter::StopScanThread();
SConfig::GetInstance().SaveSettings();
}