ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: Move dvd path settings update to lower level for now

This commit is contained in:
Matt Borgerson 2023-06-04 19:35:04 -07:00 committed by mborgerson
parent 5ac1dd1e98
commit d557a294fe
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/xemu.c
View File

@ -1562,6 +1562,7 @@ void xemu_eject_disc(Error **errp)
Error *error = NULL;
xbox_smc_eject_button();
xemu_settings_set_string(&g_config.sys.files.dvd_path, "");
// Xbox software may request that the drive open, but do it now anyway
qmp_eject(true, "ide0-cd1", false, NULL, true, false, &error);
@ -1578,12 +1579,15 @@ void xemu_load_disc(const char *path, Error **errp)
// Ensure an eject sequence is always triggered so Xbox software reloads
xbox_smc_eject_button();
xemu_settings_set_string(&g_config.sys.files.dvd_path, "");
qmp_blockdev_change_medium(true, "ide0-cd1", false, NULL, path,
false, "", false, 0,
&error);
if (error) {
error_propagate(errp, error);
} else {
xemu_settings_set_string(&g_config.sys.files.dvd_path, path);
}
xbox_smc_update_tray_state();

3
ui/xui/actions.cc
View File

@ -26,8 +26,6 @@
void ActionEjectDisc(void)
{
xemu_settings_set_string(&g_config.sys.files.dvd_path, "");
Error *err = NULL;
xemu_eject_disc(&err);
if (err) {
@ -48,7 +46,6 @@ void ActionLoadDisc(void)
/* Cancelled */
return;
}
xemu_settings_set_string(&g_config.sys.files.dvd_path, new_disc_path);
xemu_load_disc(new_disc_path, &err);
if (err) {