Fix loading mistake before shit hits the fan

FRC-Utilities · May 17, 2017 · a1064e2 · a1064e2
1 parent 0278a4d
commit a1064e2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/qml/MainWindow/Preferences.qml b/qml/MainWindow/Preferences.qml
@@ -45,7 +45,6 @@ RowLayout {
     // Open the dashboard on application launch
     //
     Component.onCompleted: {
-        DS.setProtocol (protocol.currentIndex)
         cDashboard.openDashboard (dashboard.currentIndex)
     }
 

diff --git a/qml/main.qml b/qml/main.qml
@@ -56,8 +56,6 @@ Item {
     // Initialize the DS engine when the application starts
     //
     Component.onCompleted: {
-        DS.start()
-
         if (!mainwindow.visible) {
             mainwindow.visible = true
             mainwindow.updateWindowMode()

diff --git a/src/main.cpp b/src/main.cpp
@@ -242,6 +242,7 @@ int main (int argc, char* argv[])
     /* Configure the shortcuts handler and start the DS */
     app.installEventFilter (&shortcuts);
     driverstation->declareQML();
+    driverstation->start();
 
     /* Load the QML interface */
     QQmlApplicationEngine engine;