incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix exception handling in $patch command

Browse Source
This commit is contained in:
Martin Michelsen
2023-10-21 22:13:12 -07:00
parent c4790068ef
commit c579e47354
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ChatCommands.cc
+10 -10
View File
@@ -267,12 +267,12 @@ static void proxy_command_auction(shared_ptr<ProxyServer::LinkedSession> ses, co
static void server_command_patch(shared_ptr<Client> c, const std::u16string& args) { static void server_command_patch(shared_ptr<Client> c, const std::u16string& args) {
string basename = encode_sjis(args); string basename = encode_sjis(args);
try { prepare_client_for_patches(c, [wc = weak_ptr<Client>(c), basename]() {
prepare_client_for_patches(c, [wc = weak_ptr<Client>(c), basename]() { auto c = wc.lock();
auto c = wc.lock(); if (!c) {
if (!c) { return;
return; }
} try {
auto s = c->require_server_state(); auto s = c->require_server_state();
// Note: We can't look this up outside of the closure because // Note: We can't look this up outside of the closure because
// c->specific_version can change during prepare_client_for_patches // c->specific_version can change during prepare_client_for_patches
@@ -280,10 +280,10 @@ static void server_command_patch(shared_ptr<Client> c, const std::u16string& arg
string_printf("%s-%08" PRIX32, basename.c_str(), c->specific_version)); string_printf("%s-%08" PRIX32, basename.c_str(), c->specific_version));
send_function_call(c, fn); send_function_call(c, fn);
c->function_call_response_queue.emplace_back(empty_function_call_response_handler); c->function_call_response_queue.emplace_back(empty_function_call_response_handler);
}); } catch (const out_of_range&) {
} catch (const out_of_range&) { send_text_message(c, u"Invalid patch name");
send_text_message(c, u"Invalid patch name"); }
} });
} }
static void empty_patch_return_handler(uint32_t, uint32_t) {} static void empty_patch_return_handler(uint32_t, uint32_t) {}