From 5bd2dca46365c2de0e5b5eacdab4fe49ba22be41 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 5 Jul 2020 22:12:12 -0700 Subject: [PATCH] [sim] Move HAL_LoadExtensions to end of HAL_Initialize (#2571) Previously, HAL_InitializeDriverStation would reset any callbacks set in extensions during load. --- hal/src/main/native/sim/HAL.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hal/src/main/native/sim/HAL.cpp b/hal/src/main/native/sim/HAL.cpp index bc8b637e3e..dba237b8de 100644 --- a/hal/src/main/native/sim/HAL.cpp +++ b/hal/src/main/native/sim/HAL.cpp @@ -284,8 +284,6 @@ HAL_Bool HAL_Initialize(int32_t timeout, int32_t mode) { hal::init::HAL_IsInitialized.store(true); - wpi::outs().SetUnbuffered(); - if (HAL_LoadExtensions() < 0) return false; hal::RestartTiming(); HAL_InitializeDriverStation(); @@ -307,6 +305,9 @@ HAL_Bool HAL_Initialize(int32_t timeout, int32_t mode) { } #endif // _WIN32 + wpi::outs().SetUnbuffered(); + if (HAL_LoadExtensions() < 0) return false; + return true; // Add initialization if we need to at a later point }