Browse Source

Fixed brightness tool crash

flabbet 5 years ago
parent
commit
510001a6d3

+ 1 - 1
PixiEditor/Models/Controllers/Shortcuts/ShortcutController.cs

@@ -9,7 +9,7 @@ namespace PixiEditor.Models.Controllers.Shortcuts
         public static bool BlockShortcutExecution { get; set; }
         public static bool BlockShortcutExecution { get; set; }
 
 
         public List<Shortcut> Shortcuts { get; set; }
         public List<Shortcut> Shortcuts { get; set; }
-        public Shortcut LastShortcut { get; private set; } 
+        public Shortcut LastShortcut { get; private set; }
 
 
         public ShortcutController()
         public ShortcutController()
         {
         {

+ 2 - 2
PixiEditor/ViewModels/ViewModelMain.cs

@@ -493,7 +493,7 @@ namespace PixiEditor.ViewModels
         private void KeyUp(object parameter)
         private void KeyUp(object parameter)
         {
         {
             KeyEventArgs args = (KeyEventArgs)parameter;
             KeyEventArgs args = (KeyEventArgs)parameter;
-            if (_restoreToolOnKeyUp && ShortcutController.LastShortcut.ShortcutKey == args.Key)
+            if (_restoreToolOnKeyUp && ShortcutController.LastShortcut != null && ShortcutController.LastShortcut.ShortcutKey == args.Key)
             {
             {
                 _restoreToolOnKeyUp = false;
                 _restoreToolOnKeyUp = false;
                 SetActiveTool(_lastActionTool);
                 SetActiveTool(_lastActionTool);
@@ -504,7 +504,7 @@ namespace PixiEditor.ViewModels
         public void KeyDown(object parameter)
         public void KeyDown(object parameter)
         {
         {
             KeyEventArgs args = (KeyEventArgs)parameter;
             KeyEventArgs args = (KeyEventArgs)parameter;
-            if (args.IsRepeat && !_restoreToolOnKeyUp && ShortcutController.LastShortcut.Command == SelectToolCommand)
+            if (args.IsRepeat && !_restoreToolOnKeyUp && ShortcutController.LastShortcut != null && ShortcutController.LastShortcut.Command == SelectToolCommand)
             {
             {
                 _restoreToolOnKeyUp = true;
                 _restoreToolOnKeyUp = true;
                 ShortcutController.BlockShortcutExecution = true;
                 ShortcutController.BlockShortcutExecution = true;