Browse Source

[RENDER] Don't crash if UpdateScene produced a null scene

pull/2011/head
Dan Walmsley 8 years ago
parent
commit
025c973435
  1. 2
      samples/ControlCatalog.NetCore/Program.cs
  2. 3
      src/Avalonia.Visuals/Rendering/DeferredRenderer.cs

2
samples/ControlCatalog.NetCore/Program.cs

@ -43,7 +43,7 @@ namespace ControlCatalog.NetCore
/// This method is needed for IDE previewer infrastructure /// This method is needed for IDE previewer infrastructure
/// </summary> /// </summary>
public static AppBuilder BuildAvaloniaApp() public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>().UsePlatformDetect().UseSkia().UseReactiveUI(); => AppBuilder.Configure<App>().UseX11().UseSkia().UseReactiveUI();
static void ConsoleSilencer() static void ConsoleSilencer()
{ {

3
src/Avalonia.Visuals/Rendering/DeferredRenderer.cs

@ -152,7 +152,8 @@ namespace Avalonia.Rendering
var t = (IRenderLoopTask)this; var t = (IRenderLoopTask)this;
if(t.NeedsUpdate) if(t.NeedsUpdate)
UpdateScene(); UpdateScene();
Render(true); if(_scene.Item != null)
Render(true);
} }
/// <inheritdoc/> /// <inheritdoc/>

Loading…
Cancel
Save