Skip to content

Commit 99b33b2

Browse files
committed
[Fix] Enabled/Disabled status not updating on first load of mods directory
1 parent 95d7ca9 commit 99b33b2

File tree

5 files changed

+21
-6
lines changed

5 files changed

+21
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rl2-launcher-ui"
3-
version = "1.0.0"
3+
version = "1.0.1"
44
edition = "2021"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rl2-launcher"
3-
version = "1.0.0"
3+
version = "1.0.1"
44
description = "A Rogue Legacy 2 launcher for Vanilla and RL2.ModLoader"
55
authors = ["TacoConKvass (RL2.API Team)"]
66
edition = "2021"

src-tauri/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ fn launch_epic() {
131131
"/C",
132132
"start",
133133
"",
134-
"\"com.epicgames.launcher://apps/4966d5da285c4f2c876937844b0e23ee%3Af5d84259a95a4b11ade74a7e4e0bde66%3Abd35425c9548494082d002f36601ff45?action=launch&silent=true\""
134+
"com.epicgames.launcher://apps/4966d5da285c4f2c876937844b0e23ee%3Af5d84259a95a4b11ade74a7e4e0bde66%3Abd35425c9548494082d002f36601ff45?action=launch&silent=true"
135135
])
136136
.spawn();
137137
}

src-tauri/tauri.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://schema.tauri.app/config/2",
33
"productName": "rl2-launcher",
4-
"version": "1.0.0",
4+
"version": "1.0.1",
55
"identifier": "com.rl2-launcher.app",
66
"build": {
77
"beforeDevCommand": "trunk serve",

src/app.rs

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,23 @@ pub fn Content() -> impl IntoView {
100100
if let Ok(json) = serde_wasm_bindgen::to_value(&PathArgs { path: v.to_string() }) {
101101
if invoke("check_if_correct_path", json.clone()).await == JsValue::TRUE {
102102
set_rl2_path.set(v.to_string());
103-
if let Ok(mods) = serde_wasm_bindgen::from_value(invoke("get_mod_list", json).await) {
104-
set_mod_list.set(mods);
103+
if let Ok(mods) = serde_wasm_bindgen::from_value::<std::vec::Vec::<String>>(invoke("get_mod_list", json.clone()).await) {
104+
set_mod_list.set(mods.clone());
105+
106+
for element in mods {
107+
if let Ok(serde_json::Value::Object(mod_obj)) = serde_json::from_str(&element) {
108+
if let Some(name) = mod_obj["Name"].as_str() {
109+
set_disabled.write().insert(name.to_string());
110+
}
111+
}
112+
}
113+
114+
if let Ok(enabled_mods) = serde_wasm_bindgen::from_value::<std::vec::Vec::<String>>(invoke("get_enabled_mods_list", json).await) {
115+
for element in enabled_mods {
116+
set_disabled.write().remove(&element);
117+
set_enabled.write().insert(element);
118+
}
119+
}
105120
}
106121
}
107122
}

0 commit comments

Comments
 (0)