Unstable v0.10.600.0

2020-10-01 12:19:24 -03:00
parent 20a69375ca
commit ebe1ce1427
217 changed files with 4284 additions and 1547 deletions
@@ -664,7 +664,7 @@ namespace Barotrauma
                case (char)0x1: // ctrl-a
                    SelectAll();
                    break;
-                case (char)0x1A when !Readonly: // ctrl-z
+                case (char)0x1A when !Readonly && !SubEditorScreen.IsSubEditor(): // ctrl-z
                    text = memento.Undo();
                    if (text != Text)
                    {
@@ -674,7 +674,7 @@ namespace Barotrauma
                        OnTextChanged?.Invoke(this, Text);
                    }
                    break;
-                case (char)0x12 when !Readonly: // ctrl-r
+                case (char)0x12 when !Readonly && !SubEditorScreen.IsSubEditor(): // ctrl-r
                    text = memento.Redo();
                    if (text != Text)
                    {