Fix failed assertion

wpilibsuite · Aug 1, 2023 · 53eb2df · 53eb2df
1 parent 10a54db
commit 53eb2df
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandScheduler.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandScheduler.cpp
@@ -345,8 +345,7 @@ void CommandScheduler::Cancel(Command* command) {
   if (m_impl->cancelling.contains(command)) {
     return;
   }
-  auto find = m_impl->scheduledCommands.find(command);
-  if (find == m_impl->scheduledCommands.end()) {
+  if (!IsScheduled(command)) {
     return;
   }
   m_impl->cancelling.insert(command);
@@ -355,7 +354,7 @@ void CommandScheduler::Cancel(Command* command) {
   for (auto&& action : m_impl->interruptActions) {
     action(*command);
   }
-  m_impl->scheduledCommands.erase(*find);
+  m_impl->scheduledCommands.erase(command);
   for (auto&& requirement : m_impl->requirements) {
     if (requirement.second == command) {
       m_impl->requirements.erase(requirement.first);