mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 11:24:27 +01:00
Don't crash at exit with a download still in flight
A request started since the last RequestManager::Update (headless never calls it) sat in newDownloads_, which CancelAll skipped. It was then destroyed along with the static g_DownloadManager at exit, and its destructor removed its progress bar from the already destroyed g_OSD: "mutex lock failed". Seen with a Netconf dialog still downloading the infra DNS json when a test ended. CancelAll now takes the new ones too, and runs at shutdown while g_OSD is still there. The Netconf json request is also let go of when the emulator shuts down, rather than living on into the next game. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
428c1a6aa6
commit
f20dd7565b
4 files changed
+18
No files matched your search
@@ -660,6 +660,12 @@ void __NetApctlShutdown() {
|
||||
}
|
||||
|
||||
void __NetShutdown() {
|
||||
// A Netconf dialog may have started the json download. Don't leave it running past us.
|
||||
if (g_infraDL) {
|
||||
g_infraDL->Cancel();
|
||||
g_infraDL.reset();
|
||||
}
|
||||
|
||||
// Network Cleanup
|
||||
Net_Term();
|
||||
|
||||
|
||||
Reference in new issue
Block a user