Fix bug preventing us from loading the server list from the server

This commit is contained in:
Henrik Rydgård
2026-03-30 13:49:00 -06:00
parent de228bd96c
commit 6a977bd27f
2 changed files with 5 additions and 1 deletions
+4 -1
View File
@@ -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<std::mutex> guard(g_proAdhocServerListMutex);
if (!g_proAdhocServerList.empty()) {
return;
+1
View File
@@ -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;
}