From 0d22cf5ff77e548b1649301aa29b01707206b78e Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Fri, 10 Mar 2023 22:24:40 -0500 Subject: [PATCH] [wpilib] Fix enableLiveWindowInTest crashing in disabled (#5173) --- wpilibc/src/main/native/cpp/IterativeRobotBase.cpp | 2 +- .../src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp b/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp index 0bccb0b49f..1232c65dbf 100644 --- a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp +++ b/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp @@ -95,7 +95,7 @@ void IterativeRobotBase::SetNetworkTablesFlushEnabled(bool enabled) { } void IterativeRobotBase::EnableLiveWindowInTest(bool testLW) { - if (IsTest()) { + if (IsTestEnabled()) { throw FRC_MakeError(err::IncompatibleMode, "Can't configure test mode while in test mode!"); } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java index e0fe0344c0..6c7b8bcbfb 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java @@ -253,7 +253,7 @@ public abstract class IterativeRobotBase extends RobotBase { * @throws ConcurrentModificationException if this is called during test mode. */ public void enableLiveWindowInTest(boolean testLW) { - if (isTest()) { + if (isTestEnabled()) { throw new ConcurrentModificationException("Can't configure test mode while in test mode!"); } m_lwEnabledInTest = testLW;