Browse Source
Merge pull request #2286 from AvaloniaUI/fixes/2284-deffered-renderer-nre
Fix NRE in Deffered Renderer
pull/2295/head
danwalmsley
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
11 additions and
7 deletions
-
src/Avalonia.Visuals/Rendering/DeferredRenderer.cs
|
|
|
@ -255,15 +255,19 @@ namespace Avalonia.Rendering |
|
|
|
} |
|
|
|
|
|
|
|
var (scene, updated) = UpdateRenderLayersAndConsumeSceneIfNeeded(GetContext); |
|
|
|
|
|
|
|
using (scene) |
|
|
|
{ |
|
|
|
var overlay = DrawDirtyRects || DrawFps; |
|
|
|
if (DrawDirtyRects) |
|
|
|
_dirtyRectsDisplay.Tick(); |
|
|
|
if (overlay) |
|
|
|
RenderOverlay(scene.Item, GetContext()); |
|
|
|
if (updated || forceComposite || overlay) |
|
|
|
RenderComposite(scene.Item, GetContext()); |
|
|
|
if (scene?.Item != null) |
|
|
|
{ |
|
|
|
var overlay = DrawDirtyRects || DrawFps; |
|
|
|
if (DrawDirtyRects) |
|
|
|
_dirtyRectsDisplay.Tick(); |
|
|
|
if (overlay) |
|
|
|
RenderOverlay(scene.Item, GetContext()); |
|
|
|
if (updated || forceComposite || overlay) |
|
|
|
RenderComposite(scene.Item, GetContext()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
finally |
|
|
|
|
