diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 4c3b103a32..6ac86c77ef 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -148,6 +148,9 @@ static bool ParseServerListEntriesJSON(std::string_view json) { entry.web = server.getStringOr("web", ""); entry.ip = server.getStringOr("ip", ""); entry.location = server.getStringOr("location", ""); + if (entry.location == "Unknown") { + entry.location.clear(); + } entry.description = server.getStringOr("description", ""); entry.mode = equals(server.getStringOr("data_mode", ""), "AemuPostoffice") ? AdhocDataMode::AemuPostoffice : AdhocDataMode::P2P; entry.dataJsonUrl = server.getStringOr("status_data_json", ""); @@ -184,7 +187,7 @@ static void LoadFallbackServerList() { } void AdhocLoadServerList(AdhocLoadListMode loadMode) { - { + if (loadMode == AdhocLoadListMode::CacheOnlySync) { std::lock_guard guard(g_proAdhocServerListMutex); if (!g_proAdhocServerList.empty()) { return; diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index cf2b0974da..f3a84d44d3 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -761,6 +761,7 @@ static void NativeMixWrapper(float *dest, int framesToWrite, int sampleRateHz, v static int16_t *buffer; static int bufSize; if (bufSize < framesToWrite * 2) { + // This one leaks on exit. Oh well. buffer = new int16_t[framesToWrite * 2]; bufSize = framesToWrite * 2; }