[FIX] Fix fog race condition crash on page reload#1696
Merged
willeastcott merged 2 commits intomainfrom Jan 20, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a race condition crash that occurred when the viewport rendered before scene settings were loaded on page reload. The fix adds defensive null checks using nullish coalescing and optional chaining when reading fog settings, and simplifies the code by removing unnecessary parameter passing.
Changes:
- Added nullish coalescing fallback (
?? pc.FOG_NONE) with optional chaining for fog settings access in viewport-application.ts and camera-preview.ts - Removed unnecessary
sceneSettingsObserverparameter passing from viewport.ts constructor - Replaced stored
sceneSettingsObserverproperty with directeditor.call('sceneSettings')calls
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/editor/viewport/viewport.ts | Removed sceneSettingsObserver variable and parameter passing to simplify initialization |
| src/editor/viewport/viewport-application.ts | Added optional chaining and nullish coalescing for fog settings, removed sceneSettingsObserver property |
| src/editor/viewport/camera/camera-preview.ts | Added nullish coalescing for fog settings fallback |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
slimbuck
approved these changes
Jan 20, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
sceneSettingsObserverparameter passingDetails
Fixed a race condition that caused a
TypeError: Cannot read properties of undefined (reading 'toUpperCase')crash. This occurred when:sceneSettings.get('render.fog')returnsundefined, which crashes the engineChanges
Added nullish coalescing fallback (
?? pc.FOG_NONE) when reading fog settings inviewport-application.tsandcamera-preview.tsSimplified
ViewportApplicationby callingeditor.call('sceneSettings')directly instead of storing and passingsceneSettingsObserverthrough the constructorI confirm I have read the contributing guidelines