dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix race between network client disconnect and network window deletion

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-06-22 19:23:20 +01:00
parent ccef4baea6
commit ff064e06b8
7 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/network_gui.cpp
View File

@@ -1016,7 +1016,7 @@ static const NWidgetPart _nested_network_game_widgets[] = {
static WindowDesc _network_game_window_desc(
WDP_CENTER, "list_servers", 1000, 730,
WC_NETWORK_WINDOW, WC_NONE,
0,
WDF_NETWORK,
_nested_network_game_widgets, lengthof(_nested_network_game_widgets)
);
@@ -1289,7 +1289,7 @@ static const NWidgetPart _nested_network_start_server_window_widgets[] = {
static WindowDesc _network_start_server_window_desc(
WDP_CENTER, nullptr, 0, 0,
WC_NETWORK_WINDOW, WC_NONE,
0,
WDF_NETWORK,
_nested_network_start_server_window_widgets, lengthof(_nested_network_start_server_window_widgets)
);
@@ -1366,7 +1366,7 @@ static const NWidgetPart _nested_client_list_widgets[] = {
static WindowDesc _client_list_desc(
WDP_AUTO, "list_clients", 220, 300,
WC_CLIENT_LIST, WC_NONE,
0,
WDF_NETWORK,
_nested_client_list_widgets, lengthof(_nested_client_list_widgets)
);
@@ -2259,7 +2259,7 @@ static const NWidgetPart _nested_network_join_status_window_widgets[] = {
static WindowDesc _network_join_status_window_desc(
WDP_CENTER, nullptr, 0, 0,
WC_NETWORK_STATUS_WINDOW, WC_NONE,
WDF_MODAL,
WDF_MODAL | WDF_NETWORK,
_nested_network_join_status_window_widgets, lengthof(_nested_network_join_status_window_widgets)
);
@@ -2382,7 +2382,7 @@ static const NWidgetPart _nested_network_company_password_window_widgets[] = {
static WindowDesc _network_company_password_window_desc(
WDP_AUTO, nullptr, 0, 0,
WC_COMPANY_PASSWORD_WINDOW, WC_NONE,
0,
WDF_NETWORK,
_nested_network_company_password_window_widgets, lengthof(_nested_network_company_password_window_widgets)
);
@@ -2484,7 +2484,7 @@ static const NWidgetPart _nested_network_ask_relay_widgets[] = {
static WindowDesc _network_ask_relay_desc(
WDP_CENTER, nullptr, 0, 0,
WC_NETWORK_ASK_RELAY, WC_NONE,
WDF_MODAL,
WDF_MODAL | WDF_NETWORK,
_nested_network_ask_relay_widgets, lengthof(_nested_network_ask_relay_widgets)
);