浏览代码

Merge pull request #3581 from AvaloniaUI/fixes/3544-osx-window-close-crash

Fix: dont crash when closing window on OSX.
Jumar Macato 5 年之前
父节点
当前提交
5540c54012
共有 1 个文件被更改,包括 7 次插入4 次删除
  1. 7 4
      src/Avalonia.Native/WindowImplBase.cs

+ 7 - 4
src/Avalonia.Native/WindowImplBase.cs

@@ -162,9 +162,12 @@ namespace Avalonia.Native
 
             void IAvnWindowBaseEvents.Resized(AvnSize size)
             {
-                var s = new Size(size.Width, size.Height);
-                _parent._savedLogicalSize = s;
-                _parent.Resized?.Invoke(s);
+                if (_parent._native != null)
+                {
+                    var s = new Size(size.Width, size.Height);
+                    _parent._savedLogicalSize = s;
+                    _parent.Resized?.Invoke(s);
+                }
             }
 
             void IAvnWindowBaseEvents.PositionChanged(AvnPoint position)
@@ -317,7 +320,7 @@ namespace Avalonia.Native
             _native.SetTopMost(value);
         }
 
-        public double Scaling => _native.GetScaling();
+        public double Scaling => _native?.GetScaling() ?? 1;
 
         public Action Deactivated { get; set; }
         public Action Activated { get; set; }