From 81a62645a0e4c6ba7b87713a964ac3857e96e17c Mon Sep 17 00:00:00 2001
From: MDMCK10 <21245760+MDMCK10@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:28:49 +0100
Subject: [PATCH] Merge branch 'feature/osk' of
 https://github.com/MDMCK10/collab-vm-1.2-webapp into MDMCK10-feature/osk

---
 src/ts/main.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/ts/main.ts b/src/ts/main.ts
index ea47f20..bc239e9 100644
--- a/src/ts/main.ts
+++ b/src/ts/main.ts
@@ -173,6 +173,7 @@ let commonKeyboardOptions = {
   
   
   function onKeyPress(button: string) {
+    if (VM === null) return;
     let keysym = OSK_buttonToKeysym(button);
     if (!keysym) {
       console.error(`no keysym for ${button}, report this!`);
@@ -182,27 +183,27 @@ let commonKeyboardOptions = {
     switch (true) {
       case button.startsWith("{shift"):
         shiftHeld = !shiftHeld;
-        VM!.key(keysym, shiftHeld);
+        VM.key(keysym, shiftHeld);
         break;
       case button.startsWith("{control"):
         ctrlHeld = !ctrlHeld;
-        VM!.key(keysym, ctrlHeld);
+        VM.key(keysym, ctrlHeld);
         break;
       case button === "{capslock}":
         capsHeld = !capsHeld;
-        VM!.key(keysym, capsHeld);
+        VM.key(keysym, capsHeld);
         break;
       case button.startsWith("{alt"):
         altHeld = !altHeld;
-        VM!.key(keysym, altHeld);
+        VM.key(keysym, altHeld);
         break;
       case button.startsWith("{meta"):
         metaHeld = !metaHeld;
-        VM!.key(keysym, metaHeld);
+        VM.key(keysym, metaHeld);
         break;
       default:
-        VM!.key(keysym, true);
-        VM!.key(keysym, false);
+        VM.key(keysym, true);
+        VM.key(keysym, false);
     }
   
     keyboard.setOptions({