Skip to content

Fix crashes #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
unsecretised merged 3 commits into from
Mar 25, 2026
Merged

Fix crashes #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
371e8fe
remove empty keys
unsecretised Mar 25, 2026
91e1441
Fix mode loading
unsecretised Mar 25, 2026
aa378d3
format -_-
unsecretised Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/pages/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ pub fn settings_page(config: Config) -> Element<'static, Message> {
bg_clr.into(),
settings_hint_text(theme.clone(), "Aliases"),
aliases_item(config.aliases, &theme),
settings_hint_text(theme.clone(), "Rustcast modes"),
settings_hint_text(theme.clone(), "Modes"),
modes_item(config.modes, &theme),
Row::from_iter([
savebutton(theme.clone()),
Expand Down Expand Up @@ -553,7 +553,7 @@ fn modes_item(modes: HashMap<String, String>, theme: &Theme) -> Element<'static,
let val_clone = value.clone();
let theme_clone_2 = theme.clone();
Row::from_iter([
text_input_cell(key.to_owned(), &theme_clone, "Shorthand")
text_input_cell(key.to_owned(), &theme_clone, "Mode name")
.on_input(move |input| {
Message::SetConfig(SetConfigFields::Modes(Editable::Update {
old: (key_clone.clone(), val_clone.clone()),
Expand Down
14 changes: 10 additions & 4 deletions src/app/tile/update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,9 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
}

Message::HideWindow(a) => {
if tile.page == Page::Settings {
return Task::none();
}
info!("Hiding RustCast window");
tile.visible = false;
tile.focused = false;
Expand Down Expand Up @@ -555,11 +558,11 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
std::env::var("HOME").unwrap_or("".to_string()) + "/.config/rustcast/config.toml",
)
.pick_file()
.and_then(|x| {
x.to_str().map(|x| {
.and_then(|path| {
path.to_str().map(|path_str| {
Task::batch([
Task::done(Message::SetConfig(SetConfigFields::Modes(
Editable::Create((mode_name, x.to_string())),
Editable::Create((mode_name, path_str.to_string())),
))),
Task::done(Message::WriteConfig(false)),
])
Expand All @@ -573,7 +576,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
SetConfigFields::ToggleHotkey(hk) => final_config.toggle_hotkey = hk,
SetConfigFields::ClipboardHotkey(hk) => final_config.toggle_hotkey = hk,
SetConfigFields::Modes(Editable::Create((key, value))) => {
final_config.modes.entry(key).or_insert(value);
final_config.modes.insert(key, value);
}
SetConfigFields::Modes(Editable::Delete((key, _))) => {
final_config.modes.remove(&key);
Expand Down Expand Up @@ -655,6 +658,9 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
let config_file_path =
std::env::var("HOME").unwrap_or("".to_string()) + "/.config/rustcast/config.toml";

tile.config.aliases.remove("");
tile.config.modes.remove("");

let config_string = match toml::to_string_pretty(&tile.config) {
Ok(a) => a,
Err(e) => {
Expand Down
Loading