Browse Source

PR notes

pull/995/head
Nikita Tsukanov 9 years ago
parent
commit
b18a103834
  1. 2
      src/Avalonia.Controls/Control.cs
  2. 2
      src/Avalonia.Controls/TopLevel.cs
  3. 2
      src/Avalonia.DotNetFrameworkRuntime/AppBuilder.cs

2
src/Avalonia.Controls/Control.cs

@ -645,7 +645,7 @@ namespace Avalonia.Controls
if (_focusAdorner != null) if (_focusAdorner != null)
{ {
var adornerLayer = (Panel)_focusAdorner.Parent; var adornerLayer = (IPanel)_focusAdorner.Parent;
adornerLayer.Children.Remove(_focusAdorner); adornerLayer.Children.Remove(_focusAdorner);
_focusAdorner = null; _focusAdorner = null;
} }

2
src/Avalonia.Controls/TopLevel.cs

@ -189,7 +189,7 @@ namespace Avalonia.Controls
protected virtual IRenderTarget CreateRenderTarget() protected virtual IRenderTarget CreateRenderTarget()
{ {
if(PlatformImpl == null) if(PlatformImpl == null)
throw new InvalidOperationException("PlatformImpl isn't available"); throw new InvalidOperationException("Cann't create render target, PlatformImpl is null (might be already disposed)");
return _renderInterface.CreateRenderTarget(PlatformImpl.Surfaces); return _renderInterface.CreateRenderTarget(PlatformImpl.Surfaces);
} }

2
src/Avalonia.DotNetFrameworkRuntime/AppBuilder.cs

@ -83,7 +83,7 @@ namespace Avalonia
private void LoadAssembliesInDirectory() private void LoadAssembliesInDirectory()
{ {
var location = Assembly.GetEntryAssembly().Location; var location = Assembly.GetEntryAssembly().Location;
if(location == null) if (string.IsNullOrWhiteSpace(location))
return; return;
var dir = new FileInfo(location).Directory; var dir = new FileInfo(location).Directory;
if (dir == null) if (dir == null)

Loading…
Cancel
Save