Преглед на файлове

Merge branch 'master' into master

Artyom преди 6 години
родител
ревизия
d20fcf7a4c
променени са 1 файла, в които са добавени 11 реда и са изтрити 7 реда
  1. 11 7
      src/Avalonia.Visuals/Rendering/DeferredRenderer.cs

+ 11 - 7
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