Skip to content

Commit

Permalink
Merge pull request scp-fs2open#6452 from Goober5000/6402_followup
Browse files Browse the repository at this point in the history
default the connection speed to Fast even if it has been set to None
  • Loading branch information
Goober5000 authored Dec 14, 2024
2 parents 376be36 + bcdcba7 commit e37763f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion code/network/multiutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2948,8 +2948,10 @@ int multi_get_connection_speed()
cspeed = CONNECTION_SPEED_CABLE;
} else if ( !stricmp(connection_speed, NOX("Fast")) ) {
cspeed = CONNECTION_SPEED_T1;
} else if (!stricmp(connection_speed, NOX("None"))) {
cspeed = CONNECTION_SPEED_T1; // default to Fast, per the os_config_read_string() call; per #define in multi.h, None doesn't really mean anything
} else {
cspeed = CONNECTION_SPEED_NONE;
cspeed = CONNECTION_SPEED_NONE; // this will now no longer be returned unless the connection speed string is invalid
}

return cspeed;
Expand Down

0 comments on commit e37763f

Please sign in to comment.