Browse Source

Merge remote-tracking branch 'origin/fixes/hotkey-manager-leak-fix' into fixes/hotkey-manager-leak-fix

pull/4823/head
Adir 6 years ago
parent
commit
68283d4e66
  1. 3
      build/SharedVersion.props
  2. 2
      src/Avalonia.Controls/Primitives/VisualLayerManager.cs

3
build/SharedVersion.props

@ -15,7 +15,8 @@
<PackageTags>avalonia;avaloniaui;mvvm;rx;reactive extensions;android;ios;mac;forms;wpf;net;netstandard;net461;uwp;xamarin</PackageTags>
<PackageReleaseNotes>https://github.com/AvaloniaUI/Avalonia/releases</PackageReleaseNotes>
<RepositoryType>git</RepositoryType>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile>
<SignAssembly>True</SignAssembly>
</PropertyGroup>
<ItemGroup Label="PackageIcon">

2
src/Avalonia.Controls/Primitives/VisualLayerManager.cs

@ -67,6 +67,8 @@ namespace Avalonia.Controls.Primitives
{
get
{
if (IsPopup)
return null;
var rv = FindLayer<LightDismissOverlayLayer>();
if (rv == null)
{

Loading…
Cancel
Save