Merge pull request #4291 from KyButler/master

Slightly changed wording of LOG_ERROR statements.
This commit is contained in:
James Rowe 2018-10-02 13:32:33 -06:00 committed by GitHub
commit 874a95cea7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -90,11 +90,11 @@ static void OnStateChanged(const Network::RoomMember::State& state) {
case Network::RoomMember::State::NameCollision: case Network::RoomMember::State::NameCollision:
LOG_ERROR( LOG_ERROR(
Network, Network,
"You tried to use the same nickname then another user that is connected to the Room"); "You tried to use the same nickname as another user that is connected to the Room");
exit(1); exit(1);
break; break;
case Network::RoomMember::State::MacCollision: case Network::RoomMember::State::MacCollision:
LOG_ERROR(Network, "You tried to use the same MAC-Address then another user that is " LOG_ERROR(Network, "You tried to use the same MAC-Address as another user that is "
"connected to the Room"); "connected to the Room");
exit(1); exit(1);
break; break;
@ -104,7 +104,7 @@ static void OnStateChanged(const Network::RoomMember::State& state) {
break; break;
case Network::RoomMember::State::WrongVersion: case Network::RoomMember::State::WrongVersion:
LOG_ERROR(Network, LOG_ERROR(Network,
"You are using a different version then the room you are trying to connect to"); "You are using a different version than the room you are trying to connect to");
exit(1); exit(1);
break; break;
default: default: