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.

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

progress dialog fix #14030

Merged
merged 1 commit into from Jun 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion rpcs3/Emu/Cell/PPUThread.cpp
Expand Up @@ -1535,7 +1535,7 @@ void ppu_thread::cpu_task()
// Wait until the progress dialog is closed.
// We don't want to open a cell dialog while a native progress dialog is still open.
thread_ctrl::wait_on<atomic_wait::op_ne>(g_progr_ptotal, 0);
g_fxo->get<progress_dialog_server>().show_overlay_message_only = true;
g_fxo->get<progress_dialog_workaround>().show_overlay_message_only = true;

// Sadly we can't postpone initializing guest time because we need to run PPU threads
// (the farther it's postponed, the less accuracy of guest time has been lost)
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/system_progress.cpp
Expand Up @@ -71,7 +71,7 @@ void progress_dialog_server::operator()()
renderer->is_initialized.wait(false, atomic_wait_timeout(5 * 1000000000ull));

auto manager = g_fxo->try_get<rsx::overlays::display_manager>();
show_overlay_message = show_overlay_message_only;
show_overlay_message = g_fxo->get<progress_dialog_workaround>().show_overlay_message_only;

if (manager && !show_overlay_message)
{
Expand Down
5 changes: 4 additions & 1 deletion rpcs3/Emu/system_progress.hpp
Expand Up @@ -39,7 +39,10 @@ struct progress_dialog_server
~progress_dialog_server();

static constexpr auto thread_name = "Progress Dialog Server"sv;

};

struct progress_dialog_workaround
{
// We don't want to show the native dialog during gameplay.
atomic_t<bool> show_overlay_message_only = false;
};