|
@@ -109,15 +109,15 @@ namespace InABox.Rpc
|
|
|
|
|
|
var openEvent = new ManualResetEventSlim();
|
|
|
var open = false;
|
|
|
- EventHandler onOpen = (s, e) =>
|
|
|
+ void onOpen(object s, EventArgs e)
|
|
|
{
|
|
|
open = true;
|
|
|
openEvent.Set();
|
|
|
- };
|
|
|
- EventHandler onClose = (s, e) =>
|
|
|
+ }
|
|
|
+ void onClose(object s, EventArgs e)
|
|
|
{
|
|
|
openEvent.Set();
|
|
|
- };
|
|
|
+ }
|
|
|
|
|
|
client.Opened += onOpen;
|
|
|
client.Closed += onClose;
|
|
@@ -198,13 +198,14 @@ namespace InABox.Rpc
|
|
|
openEvent.Set();
|
|
|
}
|
|
|
|
|
|
- public override void Connect()
|
|
|
+ public override bool Connect()
|
|
|
{
|
|
|
if(_socket != null)
|
|
|
{
|
|
|
openEvent.Reset();
|
|
|
_socket.Open();
|
|
|
openEvent.Wait();
|
|
|
+ return _connected;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -235,11 +236,11 @@ namespace InABox.Rpc
|
|
|
}
|
|
|
});*/
|
|
|
|
|
|
- return;
|
|
|
+ return _connected;
|
|
|
}
|
|
|
}
|
|
|
+ return _connected;
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
public override bool IsConnected() => _connected;//_socket?.State == WebSocketState.Open;
|