pbwraith/gopher64-netplay
Archived
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

re-order destruction of UI elements (#471)

Browse Source 
* re-order destruction of UI elements

* more
This commit is contained in:
Logan McNaughton 2025-07-05 21:25:41 +02:00 committed by GitHub
parent ef4f93d6f0
commit 6d85358f2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/device.rs
View File

@ -58,8 +58,8 @@ pub fn run_game(device: &mut Device, rom_contents: Vec<u8>, game_settings: ui::g
// rdram pointer is shared with parallel-rdp
rdram::init(device);
ui::audio::init(&mut device.ui, device.ai.freq);
ui::video::init(device);
ui::audio::init(&mut device.ui, device.ai.freq);
ui::input::init(&mut device.ui);
mi::init(device);
@ -81,10 +81,10 @@ pub fn run_game(device: &mut Device, rom_contents: Vec<u8>, game_settings: ui::g
cpu::run(device);
ui::input::close(&mut device.ui);
ui::video::close(&device.ui);
ui::audio::close(&mut device.ui);
ui::storage::write_saves(device);
ui::input::close(&mut device.ui);
ui::audio::close(&mut device.ui);
ui::video::close(&device.ui);
}
fn set_rng() -> rand_chacha::ChaCha8Rng {

18
src/main.rs
View File

@ -107,6 +107,14 @@ async fn main() {
}
return;
}
if args.configure_input_profile.is_some() {
ui::input::configure_input_profile(
&mut ui,
args.configure_input_profile.unwrap(),
args.use_dinput,
);
return;
}
if args.assign_controller.is_some() {
if args.port.is_none() {
println!("Must specify port number");
@ -117,7 +125,6 @@ async fn main() {
args.assign_controller.unwrap(),
args.port.unwrap(),
);
return;
}
if args.bind_input_profile.is_some() {
if args.port.is_none() {
@ -129,15 +136,6 @@ async fn main() {
args.bind_input_profile.unwrap(),
args.port.unwrap(),
);
return;
}
if args.configure_input_profile.is_some() {
ui::input::configure_input_profile(
&mut ui,
args.configure_input_profile.unwrap(),
args.use_dinput,
);
return;
}
} else if args.game.is_some() {
let file_path = std::path::Path::new(args.game.as_ref().unwrap());