Permalink
Browse files

Merge pull request #6997 from spycrab/qt_gcadapter

Qt: Fix using GC Adapter requiring restart
  • Loading branch information...
spycrab committed May 28, 2018
2 parents 18a31e1 + d0e2c35 commit cece179d77b8abccfcdc379b33a78a6f5b218929
Showing with 11 additions and 2 deletions.
  1. +11 −2 Source/Core/DolphinQt2/Config/ControllersWindow.cpp
@@ -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();
}

0 comments on commit cece179

Please sign in to comment.