Skip to content

Commit 1b0a4fe

Browse files
committed
Fix build. Fix Discord controller presses.
1 parent 77fa8ce commit 1b0a4fe

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

SerialPrograms/Source/Controllers/ControllerSession.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ class ControllerSession : private ControllerConnection::StatusListener{
8484
template <typename ControllerType, typename Lambda>
8585
std::string try_run(Lambda&& function) noexcept{
8686
std::lock_guard<std::mutex> lg(m_state_lock);
87-
if (!m_connection){
88-
return "Connection is null.";
87+
if (!m_controller){
88+
return "Controller is null.";
8989
}
9090
try{
9191
// This will be a cross-cast in most cases.
92-
ControllerType* child = dynamic_cast<ControllerType*>(m_connection.get());
92+
ControllerType* child = dynamic_cast<ControllerType*>(m_controller.get());
9393
if (child == nullptr){
9494
m_logger.log("ControllerSession::try_run(): Incompatible controller type cast.", COLOR_RED);
9595
return "Incompatible controller type cast.";

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ namespace SerialPABotBase{
3737

3838
SerialPABotBaseConnection::SerialPABotBaseConnection(Logger& logger, const QSerialPortInfo* port)
3939
: m_logger(logger, GlobalSettings::instance().LOG_EVERYTHING)
40-
, m_port(port)
4140
{
4241
set_label_text("Not Connected", COLOR_RED);
4342

SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class SerialPABotBaseConnection : public ControllerConnection{
5252
private:
5353
SerialLogger m_logger;
5454

55-
const QSerialPortInfo* m_port;
5655
uint32_t m_protocol = 0;
5756
uint8_t m_program_id = 0;
5857
std::map<ControllerType, std::set<ControllerFeature>> m_controllers;

0 commit comments

Comments
 (0)