Don't auto-close one of our restored scene tabs on startup (#3932)

solwllms · web-flow · commit 1573e4e8da4b · 2026-01-29T12:36:18.000Z
diff --git a/engine/Sandbox.Tools/Scene/Session/SceneEditorSession.cs b/engine/Sandbox.Tools/Scene/Session/SceneEditorSession.cs
@@ -88,7 +88,7 @@ internal static void OnEditorWindowRestoreLayout()
 		// So we need to show and dock them
 
 		// Restoring will open a blank SceneDock as an area for the others to dock on
-		var dummy = All.Where( x => EditorWindow.DockManager.IsDockOpen( x.SceneDock ) ).FirstOrDefault();
+		var dummy = All.Where( x => x.Scene.Source is null && EditorWindow.DockManager.IsDockOpen( x.SceneDock ) ).FirstOrDefault();
 
 		foreach ( var entry in All )
 		{
@@ -100,7 +100,7 @@ internal static void OnEditorWindowRestoreLayout()
 
 		// Remove our dummy dock, unless it's the only one open somehow
 		if ( All.Count > 1 )
-			dummy.Destroy();
+			dummy?.Destroy();
 	}
 
 	void Dock()

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ internal static void OnEditorWindowRestoreLayout()`
`88`	`88`	`// So we need to show and dock them`
`89`	`89`
`90`	`90`	`// Restoring will open a blank SceneDock as an area for the others to dock on`
`91`		`- var dummy = All.Where( x => EditorWindow.DockManager.IsDockOpen( x.SceneDock ) ).FirstOrDefault();`
	`91`	`+ var dummy = All.Where( x => x.Scene.Source is null && EditorWindow.DockManager.IsDockOpen( x.SceneDock ) ).FirstOrDefault();`
`92`	`92`
`93`	`93`	`foreach ( var entry in All )`
`94`	`94`	`{`
`@@ -100,7 +100,7 @@ internal static void OnEditorWindowRestoreLayout()`
`100`	`100`
`101`	`101`	`// Remove our dummy dock, unless it's the only one open somehow`
`102`	`102`	`if ( All.Count > 1 )`
`103`		`- dummy.Destroy();`
	`103`	`+ dummy?.Destroy();`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`void Dock()`