custom-gui-packages/pika-installer-gtk4
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finally no race conds

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-08-20 15:19:07 +00:00
parent e4a605915d
commit cae58cb750
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/manual_partitioning_page/func.rs
View File

@ -239,8 +239,8 @@ pub fn create_efi_row(
partition_changed_action, partition_changed_action,
move |row: DriveMountRow| { move |row: DriveMountRow| {
listbox.remove(&row); listbox.remove(&row);
(*used_partition_array_refcell.borrow_mut()) (*used_partition_array_refcell.borrow_mut())
.retain(|x| &x.partition.part_name != &row.partition()); .retain(|x| x.used_by != row.id());
partition_changed_action.activate(Some( partition_changed_action.activate(Some(
&glib::variant::Variant::from_data_with_type( &glib::variant::Variant::from_data_with_type(
row.id().to_string(), row.id().to_string(),
@ -471,8 +471,8 @@ pub fn create_boot_row(
partition_changed_action, partition_changed_action,
move |row: DriveMountRow| { move |row: DriveMountRow| {
listbox.remove(&row); listbox.remove(&row);
(*used_partition_array_refcell.borrow_mut()) (*used_partition_array_refcell.borrow_mut())
.retain(|x| &x.partition.part_name != &row.partition()); .retain(|x| x.used_by != row.id());
partition_changed_action.activate(Some( partition_changed_action.activate(Some(
&glib::variant::Variant::from_data_with_type( &glib::variant::Variant::from_data_with_type(
row.id().to_string(), row.id().to_string(),
@ -708,8 +708,8 @@ pub fn create_root_row(
partition_changed_action, partition_changed_action,
move |row: DriveMountRow| { move |row: DriveMountRow| {
listbox.remove(&row); listbox.remove(&row);
(*used_partition_array_refcell.borrow_mut()) (*used_partition_array_refcell.borrow_mut())
.retain(|x| &x.partition.part_name != &row.partition()); .retain(|x| x.used_by != row.id());
partition_changed_action.activate(Some( partition_changed_action.activate(Some(
&glib::variant::Variant::from_data_with_type( &glib::variant::Variant::from_data_with_type(
row.id().to_string(), row.id().to_string(),
@ -909,8 +909,8 @@ pub fn create_mount_row(
partition_changed_action, partition_changed_action,
move |row: DriveMountRow| { move |row: DriveMountRow| {
listbox.remove(&row); listbox.remove(&row);
(*used_partition_array_refcell.borrow_mut()) (*used_partition_array_refcell.borrow_mut())
.retain(|x| &x.partition.part_name != &row.partition()); .retain(|x| x.used_by != row.id());
partition_changed_action.activate(Some( partition_changed_action.activate(Some(
&glib::variant::Variant::from_data_with_type( &glib::variant::Variant::from_data_with_type(
row.id().to_string(), row.id().to_string(),
@ -989,7 +989,7 @@ fn post_check_drive_mount(
} }
} else { } else {
(*used_partition_array_refcell.borrow_mut()) (*used_partition_array_refcell.borrow_mut())
.retain(|x| &x.partition.part_name != &row.partition()); .retain(|x| x.used_by != row.id());
} }
partition_changed_action.activate(Some( partition_changed_action.activate(Some(
&glib::variant::Variant::from_data_with_type( &glib::variant::Variant::from_data_with_type(
@ -1009,6 +1009,12 @@ fn post_check_drive_mount(
#[strong] #[strong]
null_checkbutton, null_checkbutton,
#[strong] #[strong]
null_checkbutton,
#[strong]
used_partition_array_refcell,
#[strong]
partition_changed_action,
#[strong]
partition, partition,
#[strong] #[strong]
row, row,
@ -1024,7 +1030,15 @@ fn post_check_drive_mount(
} }
} else { } else {
(*partition_row_struct.swap_fs_error.borrow_mut()) = true; (*partition_row_struct.swap_fs_error.borrow_mut()) = true;
(*used_partition_array_refcell.borrow_mut()).retain(|x| x.used_by != row.id());
null_checkbutton.set_active(true); null_checkbutton.set_active(true);
row.set_partition("");
partition_changed_action.activate(Some(
&glib::variant::Variant::from_data_with_type(
row.id().to_string(),
glib::VariantTy::STRING,
),
));
partition_row_struct.widget.set_sensitive(false); partition_row_struct.widget.set_sensitive(false);
} }
} else { } else {