Handling case when scancode map doesn't exist

aQaTL · Jan 13, 2019 · 0bb9818 · 0bb9818
1 parent 721952a
commit 0bb9818
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kb_remapper"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2018"
 authors = ["aQaTL <mmsoltys@outlook.com>"]
 

diff --git a/src/keyboard/scancode_map.rs b/src/keyboard/scancode_map.rs
@@ -15,7 +15,10 @@ type KeyMapping = (Option<Key>, Option<Key>);
 pub fn load_key_mappings() -> Result<Vec<KeyMapping>, Error> {
 	let hklm = RegKey::predef(winreg::enums::HKEY_LOCAL_MACHINE);
 	let keyboard_layout = hklm.open_subkey(r"SYSTEM\CurrentControlSet\Control\Keyboard Layout")?;
-	let scancode_map = keyboard_layout.get_raw_value("Scancode Map")?.bytes;
+	let scancode_map = match keyboard_layout.get_raw_value("Scancode Map") {
+		Ok(value) => value.bytes,
+		Err(_) => return Ok(vec![]),
+	};
 
 	let mut rdr = std::io::Cursor::new(scancode_map);
 	rdr.set_position(4 * 2); //Skips version and flag headers