Skip to content

Modifies recreateControlBar() in gen and genMD to delete the previous… - #3394

Open
cbordeman48 wants to merge 6 commits into
TheSuperHackers:mainfrom
cbordeman48:main
Open

cbordeman48 wants to merge 6 commits into
TheSuperHackers:mainfrom
cbordeman48:main

Conversation

@cbordeman48

Copy link
Copy Markdown

Makes changes from #3381. Verified window count doesn't changed.

@coderabbitai

coderabbitai Bot commented Oct 2, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 6bec5a4d-3a64-441d-bcc3-57d9e8ac547f
📥 Commits

Reviewing files that changed from the base of the PR and between 7a4ba67 and 26872f5.

📒 Files selected for processing (2)
  • Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
  • GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 3 remain after this review.


Walkthrough

Both game variants update recreateControlBar to find and destroy the ControlBarParent window through the window manager. The remaining recreation steps are unchanged.

Changes

Control bar recreation

Layer / File(s) Summary
Destroy the control bar parent window
Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp, GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
recreateControlBar now finds the ControlBarParent window and destroys it through the window manager. The existing recreation steps remain unchanged.

Priority: ⬇️ Low

Estimated code review effort: 1 (Trivial) | ~5 minutes

Change: Bug fix

Suggested reviewers: bobtista

Merge Risk: ⚪ Minimal · up to 26872

Control-bar recreation now removes the prior parent window and its descendants before rebuilding. No concrete user-facing regression or merge blocker is established.

Architecture Summary

Architecture risk: 🔵 Low · up to 26872

The change affects 2 systems.

Changed systems: Generals, GeneralsMD

Architecture concerns
No architecture-level concerns identified.

Review details

Systems and components

  • observed — Generals (service) was modified; 1 changed file maps to changed impact.
  • observed — GeneralsMD (service) was modified; 1 changed file maps to changed impact.

Before / after behavior

  • observed — Modified behavior in Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp: recreateControlBar now looks up the ControlBar.wnd:ControlBarParent window and destroys it through TheWindowManager, replacing the lookup of ControlBar.wnd and deleteInstance call.
  • observed — Modified behavior in GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp: recreateControlBar now looks up the ControlBar.wnd:ControlBarParent window and destroys it through TheWindowManager->winDestroy, replacing lookup of ControlBar.wnd followed by deleteInstance.
🚥 Pre-merge checks | ✅ 4
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed The title identifies changes to recreateControlBar() in both game variants and describes deleting the previous window, which matches the main change.
Description check ✅ Passed The description connects the changes to PR #3381 and reports verification of the window count, so it relates to the changeset.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Autopilot is currently an internal CodeRabbit preview.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@greptile-apps

greptile-apps Bot commented Oct 2, 2026 •

Copy link
Copy Markdown

RetriggerConfidence Score: 5/5

[Medium risk] Changes how the in-game control bar is destroyed and recreated.

The PR appears safe to merge based on the changes since the previous review.

Summary

The PR changes both game variants to destroy the previous control-bar parent window through the window manager before recreating the control bar. Since the previous review, the only change removes trailing whitespace.

Reviews (5) · Last reviewed commit: "Removed trailing tab."

Comment thread GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp Outdated
Comment thread Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp Outdated
@xezon xezon added Minor Severity: Minor < Major < Critical < Blocker Gen Relates to Generals ZH Relates to Zero Hour Memory Is memory related Fix Is fixing something, but is not user facing labels Oct 2, 2026
Comment thread GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp Outdated
@cbordeman48

cbordeman48 commented Oct 3, 2026 •

Copy link
Copy Markdown
Author

Sorry, schizo branch. All changes made.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Fix Is fixing something, but is not user facing Gen Relates to Generals Memory Is memory related Minor Severity: Minor < Major < Critical < Blocker ZH Relates to Zero Hour

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants