Skip to content
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

Jump to bottom

Fix Boot inconsistencies for Reloads #7434

Merged
merged 3 commits into from
Feb 8, 2020
Merged

Fix Boot inconsistencies for Reloads #7434

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
bd571ef
Fix Boot inconsistencies for Reloads
Megamouse Feb 8, 2020
f36f87a
Restart games with the same config instead of global
Megamouse Feb 8, 2020
427e2a3
Qt: fix game category localization
Megamouse Feb 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 10 additions & 5 deletions rpcs3/Emu/System.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,8 @@ void Emulator::SetForceBoot(bool force_boot)

void Emulator::Load(const std::string& title_id, bool add_only, bool force_global_config)
{
m_force_global_config = force_global_config;

if (!IsStopped())
{
Stop();
Expand Down Expand Up @@ -1223,7 +1225,7 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
if (fs::rename(elf_dir + "/../../", hdd0_disc + elf_dir.substr(hdd0_game.size()) + "/../../", false))
{
sys_log.success("Disc game %s moved to special location /dev_hdd0/disc/", m_title_id);
return m_path = hdd0_disc + m_path.substr(hdd0_game.size()), Load();
return m_path = hdd0_disc + m_path.substr(hdd0_game.size()), Load(m_title_id, add_only, force_global_config);
}
else
{
Expand Down Expand Up @@ -1422,7 +1424,7 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
{
// Booting game update
sys_log.success("Updates found at /dev_hdd0/game/%s/!", m_title_id);
return m_path = hdd0_boot, Load();
return m_path = hdd0_boot, Load(m_title_id, false, force_global_config);
}

// Set title to actual disc title if necessary
Expand Down Expand Up @@ -1639,7 +1641,8 @@ void Emulator::Run(bool start_playtime)
{
if (!IsReady())
{
Load();
// Reload with prior configuration.
Load(m_title_id, false, m_force_global_config);

if (!IsReady())
{
Expand Down Expand Up @@ -1797,7 +1800,8 @@ void Emulator::Stop(bool restart)
{
if (restart)
{
return Load();
// Reload with prior configs.
return Load(m_title_id, false, m_force_global_config);
}

m_force_boot = false;
Expand Down Expand Up @@ -1841,7 +1845,8 @@ void Emulator::Stop(bool restart)

if (restart)
{
return Load();
// Reload with prior configs.
return Load(m_title_id, false, m_force_global_config);
}

// Boot arg cleanup (preserved in the case restarting)
Expand Down
1 change: 1 addition & 0 deletions rpcs3/Emu/System.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ class Emulator final
std::string m_usr{"00000001"};
u32 m_usrid{1};

bool m_force_global_config = false;
bool m_force_boot = false;
bool m_has_gui = true;

Expand Down
8 changes: 4 additions & 4 deletions rpcs3/rpcs3qt/game_list_frame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
hide_serial->setChecked(m_hidden_list.contains(serial));
myMenu.addSeparator();
QMenu* remove_menu = myMenu.addMenu(tr("&Remove"));
QAction* removeGame = remove_menu->addAction(tr("&Remove %1").arg(qstr(currGame.category)));
QAction* removeGame = remove_menu->addAction(tr("&Remove %1").arg(gameinfo->localized_category));
if (gameinfo->hasCustomConfig)
{
QAction* remove_custom_config = remove_menu->addAction(tr("&Remove Custom Configuration"));
Expand Down Expand Up @@ -1076,7 +1076,7 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
return;
}

QMessageBox* mb = new QMessageBox(QMessageBox::Question, tr("Confirm %1 Removal").arg(qstr(currGame.category)), tr("Permanently remove %0 from drive?\nPath: %1").arg(name).arg(qstr(currGame.path)), QMessageBox::Yes | QMessageBox::No, this);
QMessageBox* mb = new QMessageBox(QMessageBox::Question, tr("Confirm %1 Removal").arg(gameinfo->localized_category), tr("Permanently remove %0 from drive?\nPath: %1").arg(name).arg(qstr(currGame.path)), QMessageBox::Yes | QMessageBox::No, this);
mb->setCheckBox(new QCheckBox(tr("Remove caches and custom configs")));
mb->deleteLater();
if (mb->exec() == QMessageBox::Yes)
Expand All @@ -1093,12 +1093,12 @@ void game_list_frame::ShowContextMenu(const QPoint &pos)
RemoveCustomPadConfiguration(currGame.serial);
}
m_game_data.erase(std::remove(m_game_data.begin(), m_game_data.end(), gameinfo), m_game_data.end());
game_list_log.success("Removed %s %s in %s", currGame.category, currGame.name, currGame.path);
game_list_log.success("Removed %s %s in %s", sstr(gameinfo->localized_category), currGame.name, currGame.path);
Refresh(true);
}
else
{
game_list_log.error("Failed to remove %s %s in %s (%s)", currGame.category, currGame.name, currGame.path, fs::g_tls_error);
game_list_log.error("Failed to remove %s %s in %s (%s)", sstr(gameinfo->localized_category), currGame.name, currGame.path, fs::g_tls_error);
QMessageBox::critical(this, tr("Failure!"), tr(remove_caches ? "Failed to remove %0 from drive!\nPath: %1\nCaches and custom configs have been left intact." : "Failed to remove %0 from drive!\nPath: %1").arg(name).arg(qstr(currGame.path)));
}
}
Expand Down