error/success handling (user feedback)

This commit is contained in:
2020-08-23 16:36:27 +01:00
parent 3903e4e6be
commit cbe3a33311
4 changed files with 28 additions and 3 deletions

View File

@@ -41,6 +41,11 @@ pub fn load_additional(game_data: String) -> String {
#[wasm_bindgen]
pub fn merge() -> String {
let state = STATE.lock().unwrap();
if state.main.is_none() || state.additional.is_none() {
return "".to_string();
}
let mut main = state.main.clone().unwrap();
let additional = state.additional.clone().unwrap();
main.merge(additional);