Merge pull request #1332 from VladiStep/glyphRectEditorFix

A fix of a rare crash on "Wine".
UnderminersTeam · Apr 18, 2023 · 17a6f2c · 17a6f2c
2 parents 7bbe91d + c3e9dc5
commit 17a6f2c
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/UndertaleModTool/Editors/UndertaleFontEditor/EditGlyphRectangleWindow.xaml.cs b/UndertaleModTool/Editors/UndertaleFontEditor/EditGlyphRectangleWindow.xaml.cs
@@ -193,9 +193,7 @@ private void TextureViewbox_MouseLeftButtonDown(object sender, MouseButtonEventA
                 }
             }
 
-            if (canvas is null)
-                return;
-            initPoint = e.GetPosition(canvas);
+            initPoint = e.GetPosition(TextureViewbox);
             if (isNewCharacter)
             {
                 SelectedGlyph.SourceX = (ushort)Math.Round(initPoint.X);
@@ -222,7 +220,7 @@ private void TextureViewbox_MouseLeftButtonUp(object sender, MouseButtonEventArg
         }
         private void TextureViewbox_MouseMove(object sender, MouseEventArgs e)
         {
-            var pos = e.GetPosition(canvas);
+            var pos = e.GetPosition(TextureViewbox);
 
             if (dragInProgress)
             {
@@ -316,12 +314,12 @@ private void TextureViewbox_MouseMove(object sender, MouseEventArgs e)
             else
             {
                 var hitType = GetHitType(selectedRect, pos);
-                canvas.Cursor = GetCursorForType(hitType);
+                TextureViewbox.Cursor = GetCursorForType(hitType);
             }
         }
         private void TextureViewbox_MouseMove_New(object sender, MouseEventArgs e)
         {
-            var pos = e.GetPosition(canvas);
+            var pos = e.GetPosition(TextureViewbox);
 
             if (dragInProgress)
             {