From 2dc7f0b5e88aba7469f7907bed69846db30ec932 Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Sun, 19 Mar 2023 13:48:01 -0700
Subject: [PATCH] Remove dialogue and cutscene bars if disabling completestop

This fixes a bug where the trinket collection text boxes, along with the
cutscene bars, would stay on-screen if the player warped to the ship
while they were up.

This only happens during the gamestate 0 anti-softlock checks, and only
if completestop is active in the first place, so text boxes aren't
cleared if the player is doing something that wouldn't lead to a
softlock otherise.

Fixes #921.
---
 desktop_version/src/Game.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index ee21222f..82e81dae 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -805,6 +805,12 @@ void Game::updatestate(void)
             }
             else
             {
+                if (completestop)
+                {
+                    /* Close potential collection dialogue if warping to ship */
+                    graphics.textboxremove();
+                    graphics.showcutscenebars = false;
+                }
                 /* Prevent softlocks if there's no cutscene running right now */
                 hascontrol = true;
                 completestop = false;