From d5ed445c4b69917a2eed418cb3f9b8b1d081fdf4 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 22 Oct 2023 17:18:27 -0700 Subject: [PATCH] More compile fixes, fix CFrontEndUI segfault --- Runtime/MP1/CFrontEndUI.cpp | 2 +- extern/aurora | 2 +- extern/zeus | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Runtime/MP1/CFrontEndUI.cpp b/Runtime/MP1/CFrontEndUI.cpp index 8c6df3927..0e644b6a3 100644 --- a/Runtime/MP1/CFrontEndUI.cpp +++ b/Runtime/MP1/CFrontEndUI.cpp @@ -2133,7 +2133,7 @@ CIOWin::EMessageReturn CFrontEndUI::Update(float dt, CArchitectureQueue& queue) return EMessageReturn::Exit; } /* Poll loading music and FRME resources */ - if (!xd4_audio1->IsReady() || !xd8_audio2->IsReady() || !xe0_frontendCardFrme->PumpLoad() || + if (/*!xd4_audio1->IsReady() || !xd8_audio2->IsReady() || */ !xe0_frontendCardFrme->PumpLoad() || !xe8_frontendNoCardFrme->PumpLoad() || !xdc_saveUI->PumpLoad()) return EMessageReturn::Exit; // xf4_curAudio = xd4_audio1.get(); diff --git a/extern/aurora b/extern/aurora index 104f089cd..365cea46d 160000 --- a/extern/aurora +++ b/extern/aurora @@ -1 +1 @@ -Subproject commit 104f089cd0a89af1cbbaafd789223de38f8e7658 +Subproject commit 365cea46dae3bc35070842580d565eeb2c39b1e5 diff --git a/extern/zeus b/extern/zeus index e9ec10a38..316d937f1 160000 --- a/extern/zeus +++ b/extern/zeus @@ -1 +1 @@ -Subproject commit e9ec10a3823a3c734e70c99b4aa50ae2a7e7e81f +Subproject commit 316d937f1131fbe194fb987fd3f54d704d6c3cec