diff options
author | bunnei <bunneidev@gmail.com> | 2020-07-14 12:01:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-14 12:01:43 -0400 |
commit | bf9c010be51736a1d579479fe45a6f091014d554 (patch) | |
tree | d0098c8e0af4625ed09d14dc2d3405bfabd2e2ee /src/input_common/gcadapter/gc_adapter.h | |
parent | 393cdb15f508d0b3b9db1592c4e081c0f21e907a (diff) | |
parent | ab65de2f96984415cbeb3fee392b930c61f0d8b4 (diff) |
Merge pull request #4338 from ameerj/disconnected-adapter
gcadapter: Fix crash if gc configured but adapter not connected
Diffstat (limited to 'src/input_common/gcadapter/gc_adapter.h')
-rw-r--r-- | src/input_common/gcadapter/gc_adapter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input_common/gcadapter/gc_adapter.h b/src/input_common/gcadapter/gc_adapter.h index 120ce4c02..e2cdd6255 100644 --- a/src/input_common/gcadapter/gc_adapter.h +++ b/src/input_common/gcadapter/gc_adapter.h @@ -100,6 +100,9 @@ public: void BeginConfiguration(); void EndConfiguration(); + /// Returns true if there is a device connected to port + bool DeviceConnected(std::size_t port); + std::array<Common::SPSCQueue<GCPadStatus>, 4>& GetPadQueue(); const std::array<Common::SPSCQueue<GCPadStatus>, 4>& GetPadQueue() const; @@ -119,9 +122,6 @@ private: /// Stop scanning for the adapter void StopScanThread(); - /// Returns true if there is a device connected to port - bool DeviceConnected(std::size_t port); - /// Resets status of device connected to port void ResetDeviceType(std::size_t port); |