piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8833 from Ebola16/Panic

Browse Source 
Android: Use DialogFragment for AlertMessage
This commit is contained in:
JosJuice
2020-10-10 21:03:52 +02:00
committed by GitHub
parent 696f08ede3 c3f34ac3fa
commit 5a939ccfaf
9 changed files with 182 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/Core.cpp
View File

@ -170,6 +170,11 @@ void DisplayMessage(std::string message, int time_in_ms)
OSD::AddMessage(std::move(message), time_in_ms);
}
bool IsBooting()
{
return s_is_booting.IsSet() || !s_hardware_initialized;
}
bool IsRunning()
{
return (GetState() != State::Uninitialized || s_hardware_initialized) && !s_is_stopping;
@ -674,7 +679,7 @@ State GetState()
void WaitUntilDoneBooting()
{
if (s_is_booting.IsSet() || !s_hardware_initialized)
if (IsBooting())
s_done_booting.Wait();
}

1
Source/Core/Core/Core.h
View File

@ -99,6 +99,7 @@ void UndeclareAsCPUThread();
std::string StopMessage(bool main_thread, std::string_view message);
bool IsBooting();
bool IsRunning();
bool IsRunningAndStarted(); // is running and the CPU loop has been entered
bool IsRunningInCurrentThread(); // this tells us whether we are running in the CPU thread.