Skip to content

fix(shell): Avoid initializing layouts during teardown #3158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CryoTheRenegade wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −7
Open

fix(shell): Avoid initializing layouts during teardown #3158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
024478e
fix(shell): Avoid initializing layouts during teardown
CryoTheRenegade Aug 16, 2026
623d82a
refactor(shell): Clarify doPop parameter semantics
CryoTheRenegade Aug 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Core/GameEngine/Include/GameClient/Shell.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class Shell : public SubsystemInterface
// pseudo-stack operations for manipulating layouts
void push( AsciiString filename, Bool shutdownImmediate = FALSE ); ///< load new screen on top, optionally doing an immediate shutdown
void pop(); ///< pop top layout
void popImmediate(); ///< pop now, don't wait for shutdown
void popImmediate( Bool suppressInit = FALSE ); ///< pop now, optionally suppressing init of the uncovered layout
void showShell( Bool runInit = TRUE ); ///< init the top of stack
void hideShell(); ///< shutdown the top of stack
WindowLayout *top(); ///< return top layout
Expand Down Expand Up @@ -166,7 +166,7 @@ class Shell : public SubsystemInterface
void unlinkScreen( WindowLayout *screen ); ///< remove screen from list

void doPush( AsciiString layoutFile ); ///< workhorse for push action
void doPop( Bool impendingPush ); ///< workhorse for pop action
void doPop( Bool suppressInit ); ///< workhorse for pop action

enum { MAX_SHELL_STACK = 16 }; ///< max simultaneous shell screens
WindowLayout *m_screenStack[ MAX_SHELL_STACK ]; ///< the screen layout stack
Expand Down
11 changes: 6 additions & 5 deletions Core/GameEngine/Source/GameClient/GUI/Shell/Shell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ void Shell::deconstruct()
WindowLayout *newTop = top();
while(newTop)
{
popImmediate();
// TheSuperHackers @bugfix CryoTheRenegade 10/08/2026 Do not initialize uncovered screens while the shell is being destroyed.
popImmediate( TRUE );
newTop = top();
}

Expand Down Expand Up @@ -424,7 +425,7 @@ void Shell::pop()
* from the shutdown() for the screen, it will be immediately popped off
* the stack */
//-------------------------------------------------------------------------------------------------
void Shell::popImmediate()
void Shell::popImmediate( Bool suppressInit )
{
WindowLayout *screen = top();

Expand All @@ -448,7 +449,7 @@ void Shell::popImmediate()
screen->runShutdown( &immediatePop );

// pop the screen of the stack
doPop( FALSE );
doPop( suppressInit );
Comment thread
qodo-free-for-open-source-projects[bot] marked this conversation as resolved.

if (TheIMEManager)
TheIMEManager->detach();
Expand Down Expand Up @@ -685,7 +686,7 @@ void Shell::doPush( AsciiString layoutFile )
//-------------------------------------------------------------------------------------------------
/** Actually do the work for a pop */
//-------------------------------------------------------------------------------------------------
void Shell::doPop( Bool impendingPush )
void Shell::doPop( Bool suppressInit )
{
WindowLayout *currentTop = top();

Expand All @@ -706,7 +707,7 @@ void Shell::doPop( Bool impendingPush )

// run the init for the new top of the stack if present
WindowLayout *newTop = top();
if( newTop && !impendingPush )
if( newTop && !suppressInit )
{
newTop->runInit( nullptr );
//newTop->bringForward();
Expand Down
Loading