Merge pull request #4 from Team6083/develop

Fix installer
Team6083 · Aug 24, 2018 · 69d2d6c · 69d2d6c
2 parents f6c0ef9 + ed593a5
commit 69d2d6c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/main.js b/main.js
@@ -6,6 +6,9 @@ const electron = require('electron');
 const wpilib_NT = require('wpilib-nt-client');
 const client = new wpilib_NT.Client();
 
+
+if(require('electron-squirrel-startup')) return;
+
 // The client will try to reconnect after 1 second
 client.setReconnectDelay(1000)
 
@@ -129,22 +132,22 @@ function startNTconnect() {
     let NtAddress = ["172.22.11.2", "10.60.83.2", "roborio-6083-frc.local", "127.0.0.1"]
 
     NtAddress.forEach(function (host) {
-        tcpp.probe(host, 1735, function(err, available) {
-            if(available){
+        tcpp.probe(host, 1735, function (err, available) {
+            if (available) {
                 console.log(host);
                 targetHost = host;
             }
         });
     });
 
-    setTimeout(function(){
-        if(targetHost == ""){
+    setTimeout(function () {
+        if (targetHost == "") {
             startNTconnect();
         }
-        else{
+        else {
             connectToNT(targetHost);
         }
-    },5000);
+    }, 5000);
 }
 
 function connectToNT(address, port) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "bootstrap": "^4.1.3",
     "canvas-gauges": "^2.1.5",
     "d3": "^5.6.0",
+    "electron-squirrel-startup": "^1.0.0",
     "jquery": "^3.3.1",
     "popper.js": "^1.12.9",
     "tcp-ping": "^0.1.1",