mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix bug that gave error when trying to join saved server
This commit is contained in:
parent
e582a8f47f
commit
e742e96461
|
@ -217,7 +217,7 @@ static void window_server_list_mouseup(rct_window *w, int widgetIndex)
|
||||||
case WIDX_LIST:{
|
case WIDX_LIST:{
|
||||||
int serverIndex = w->selected_list_item;
|
int serverIndex = w->selected_list_item;
|
||||||
if (serverIndex >= 0 && serverIndex < _numServerEntries) {
|
if (serverIndex >= 0 && serverIndex < _numServerEntries) {
|
||||||
if (strcmp(_serverEntries[serverIndex].version, NETWORK_STREAM_ID) != 0) {
|
if (strcmp(_serverEntries[serverIndex].version, NETWORK_STREAM_ID) != 0 && strcmp(_serverEntries[serverIndex].version, "") != 0) {
|
||||||
RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS, void *) = _serverEntries[serverIndex].version;
|
RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS, void *) = _serverEntries[serverIndex].version;
|
||||||
window_error_open(STR_UNABLE_TO_CONNECT_TO_SERVER, STR_MULTIPLAYER_INCORRECT_SOFTWARE_VERSION);
|
window_error_open(STR_UNABLE_TO_CONNECT_TO_SERVER, STR_MULTIPLAYER_INCORRECT_SOFTWARE_VERSION);
|
||||||
break;
|
break;
|
||||||
|
@ -253,7 +253,7 @@ static void window_server_list_dropdown(rct_window *w, int widgetIndex, int drop
|
||||||
|
|
||||||
switch (dropdownIndex) {
|
switch (dropdownIndex) {
|
||||||
case DDIDX_JOIN:
|
case DDIDX_JOIN:
|
||||||
if (strcmp(_serverEntries[serverIndex].version, NETWORK_STREAM_ID) != 0) {
|
if (strcmp(_serverEntries[serverIndex].version, NETWORK_STREAM_ID) != 0 && strcmp(_serverEntries[serverIndex].version, "") != 0) {
|
||||||
RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS, void *) = _serverEntries[serverIndex].version;
|
RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS, void *) = _serverEntries[serverIndex].version;
|
||||||
window_error_open(STR_UNABLE_TO_CONNECT_TO_SERVER, STR_MULTIPLAYER_INCORRECT_SOFTWARE_VERSION);
|
window_error_open(STR_UNABLE_TO_CONNECT_TO_SERVER, STR_MULTIPLAYER_INCORRECT_SOFTWARE_VERSION);
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue