Skip to content

Commit e1f4177

Browse files
heeenlokesku
authored andcommitted
fix error reporting from bridge client
1 parent d15b778 commit e1f4177

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Assets/Scripts/Components/BridgeClient.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void Connect(string connection)
4141
}
4242

4343
Connection = connection;
44-
ConnectTime = 0;
44+
ConnectTime = Stopwatch.GetTimestamp();
4545
}
4646

4747
public void Update()
@@ -64,32 +64,32 @@ public void Update()
6464
return;
6565
}
6666

67-
// do not reconnect in non interactive mode
6867
// do not reconnect in simulation error state
6968
// do not reconnect in simulation stopping state
7069
if (BridgeStatus == Status.UnexpectedlyDisconnected &&
71-
( Loader.Instance.CurrentSimulation.Interactive == false
72-
|| Loader.Instance.Status == SimulatorStatus.Error
70+
(Loader.Instance.Status == SimulatorStatus.Error
7371
|| Loader.Instance.Status == SimulatorStatus.Stopping))
72+
{
73+
Bridge.Disconnect();
74+
Disconnected = true;
75+
}
76+
// do not reconnect in non interactive mode and report error
77+
else if (BridgeStatus == Status.UnexpectedlyDisconnected &&
78+
Loader.Instance.CurrentSimulation.Interactive == false)
7479
{
7580
Loader.Instance.reportStatus(SimulatorStatus.Error, "Bridge socket was unexpectedly disconnected");
7681
Bridge.Disconnect();
7782
Disconnected = true;
7883
}
7984
else if (disconnectedStatus)
8085
{
81-
if (Stopwatch.GetTimestamp() > ConnectTime || ConnectTime == 0 || Time.timeScale == 0f)
86+
if (Stopwatch.GetTimestamp() >= ConnectTime)
8287
{
8388
Disconnected = false;
8489
Bridge.Connect(Connection);
8590
}
86-
else
87-
{
88-
return;
89-
}
9091
}
91-
92-
if (BridgeStatus == Status.Connected)
92+
else if (BridgeStatus == Status.Connected)
9393
{
9494
Bridge.Update();
9595
}

0 commit comments

Comments
 (0)