fix merge

This commit is contained in:
Jari van der Kaap 2023-04-22 21:34:32 +02:00
parent 9147501b8d
commit dc463bc812

View File

@ -7,6 +7,7 @@
#include <utils/string.hpp>
#include <utils/concurrency.hpp>
#include <utils/hook.hpp>
#include <utils/io.hpp>
#include "network.hpp"
#include "scheduler.hpp"
@ -20,7 +21,7 @@ namespace server_list
struct state
{
game::netadr_t address{};
bool requesting{false};
bool requesting{ false };
std::chrono::high_resolution_clock::time_point query_start{};
callback callback{};
};
@ -222,6 +223,11 @@ namespace server_list
}, scheduler::async, 200ms);
lua_serverinfo_to_table_hook.create(0x141F1FD10_g, lua_serverinfo_to_table_stub);
scheduler::once([]
{
read_favorite_servers();
}, scheduler::main);
}
void pre_destroy() override