DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Modify] Add a check

Browse Source
This commit is contained in:
sta 2016-03-27 14:56:34 +09:00
parent 49b09654f6
commit 8126aa5111
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
websocket-sharp/WebSocket.cs
View File

@ -2870,7 +2870,6 @@ namespace WebSocketSharp
/// </param> /// </param>
public void SetProxy (string url, string username, string password) public void SetProxy (string url, string username, string password)
{ {
lock (_forConn) {
string msg; string msg;
if (!checkIfAvailable (true, false, true, false, false, true, out msg)) { if (!checkIfAvailable (true, false, true, false, false, true, out msg)) {
_logger.Error (msg); _logger.Error (msg);
@ -2879,6 +2878,14 @@ namespace WebSocketSharp
return; return;
} }
lock (_forConn) {
if (!checkIfAvailable (true, false, false, true, out msg)) {
_logger.Error (msg);
error ("An error has occurred in setting the proxy.", null);
return;
}
if (url.IsNullOrEmpty ()) { if (url.IsNullOrEmpty ()) {
_logger.Warn ("The proxy url and credentials are set back to the default."); _logger.Warn ("The proxy url and credentials are set back to the default.");
_proxyUri = null; _proxyUri = null;