Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-17 04:39:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

http: Ensure webserver shutdown on exit.

Browse Source
This commit is contained in:
Unknown W. Brackets 2019-09-28 11:12:12 -07:00
parent c8c0cd51c7
commit e639dc801f
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/WebServer.cpp
View File

@ -288,7 +288,6 @@ bool StartWebServer(WebServerFlags flags) {
serverStatus = ServerStatus::STARTING;
serverFlags = (int)flags;
serverThread = std::thread(&ExecuteWebServer);
serverThread.detach();
return true;
default:
@ -321,3 +320,9 @@ bool WebServerStopped(WebServerFlags flags) {
}
return serverStatus == ServerStatus::STOPPED;
}
void ShutdownWebServer() {
StopWebServer(WebServerFlags::ALL);
if (serverThread.joinable())
serverThread.join();
}

1
Core/WebServer.h
View File

@ -26,5 +26,6 @@ bool StartWebServer(WebServerFlags flags);
bool StopWebServer(WebServerFlags flags);
bool WebServerStopping(WebServerFlags flags);
bool WebServerStopped(WebServerFlags flags);
void ShutdownWebServer();
bool RemoteISOFileSupported(const std::string &filename);

5
UI/NativeApp.cpp
View File

@ -869,11 +869,12 @@ void NativeShutdownGraphics() {
winAudioBackend = nullptr;
#endif
ShutdownWebServer();
UIBackgroundShutdown();
delete g_gameInfoCache;
g_gameInfoCache = nullptr;
UIBackgroundShutdown();
delete uiContext;
uiContext = nullptr;