merge from 2.3

This commit is contained in:
RaidMax 2019-09-09 17:41:58 -05:00
commit adc73eb7ff
2 changed files with 5 additions and 1 deletions

View File

@ -153,6 +153,10 @@ namespace IW4MAdmin.Plugins.Stats
{ {
break; break;
} }
else
{
break;
}
break; break;
} }
} }

View File

@ -130,7 +130,7 @@ namespace SharedLibraryCore.RCon
catch (OverflowException) catch (OverflowException)
{ {
connectionState.OnComplete.Release(1); connectionState.OnComplete.Release(1);
throw new NetworkException($"Invalid character expected when converting encodings - {parameters}"); throw new NetworkException($"Invalid character encountered when converting encodings - {parameters}");
} }
byte[] response = null; byte[] response = null;