Skip to content

Commit 2cecf8c

Browse files
committed
Automatic merge of T1.5.1-684-gc6e0de1c4 and 10 pull requests
- Pull request #570 at c59c788: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #865 at 67014b7: Dispatcher window improvements - Pull request #874 at f8dbeab: Dynamic brake controller refactoring - Pull request #875 at 43bf33e: Bug fix for https://bugs.launchpad.net/or/+bug/2036346 Player train switching doesn't work with 3D cabs - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #878 at 43f6ee9: Implement Polach Adhesion - Pull request #882 at e92be5a: Blueprint/train car operations UI window - Pull request #883 at edcc2dd: SwitchPanel disconnect/connect handling - Pull request #885 at c81447b: feat: Add notifications to Menu
12 parents ef0095c + c6e0de1 + c59c788 + d00beb9 + 67014b7 + f8dbeab + 43bf33e + f92de76 + 43f6ee9 + e92be5a + edcc2dd + c81447b commit 2cecf8c

File tree

1 file changed

+2
-2
lines changed
  • Source/RunActivity/Viewer3D/WebServices/Web/SwitchPanel

1 file changed

+2
-2
lines changed

Source/RunActivity/Viewer3D/WebServices/Web/SwitchPanel/index2.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ function createSocket() {
6565
};
6666

6767
setTimeout(function () {
68-
// close the socket if no connection established after 1 second
68+
// close the socket if no connection established after 3 seconds
6969
// otherwise it will wait with the reconnect after a timeout of 2 minutes
7070
if (websocket.readyState != 1) {
7171
websocket.close();
7272
}
73-
}, 1000);
73+
}, 3000);
7474

7575
return connection;
7676
}

0 commit comments

Comments
 (0)