From 05f0ec267e2f1fadbcfafbd4f1166928b73acfd3 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sat, 24 Jun 2017 18:53:00 -0700
Subject: [PATCH] fix an initialization order fiasco

---
 libraries/controllers/src/controllers/Input.cpp           | 7 ++++++-
 libraries/controllers/src/controllers/Input.h             | 2 ++
 libraries/controllers/src/controllers/UserInputMapper.cpp | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libraries/controllers/src/controllers/Input.cpp b/libraries/controllers/src/controllers/Input.cpp
index 6f8bd547a2..dbc9071f43 100644
--- a/libraries/controllers/src/controllers/Input.cpp
+++ b/libraries/controllers/src/controllers/Input.cpp
@@ -9,9 +9,14 @@
 #include "Input.h"
 
 namespace controller {
-    const Input Input::INVALID_INPUT = Input(0x7fffffff);
+    const Input Input::INVALID_INPUT = invalidInput();
     const uint16_t Input::INVALID_DEVICE = Input::INVALID_INPUT.device;
     const uint16_t Input::INVALID_CHANNEL = Input::INVALID_INPUT.channel;
     const uint16_t Input::INVALID_TYPE = Input::INVALID_INPUT.type;
+
+    const Input& Input::invalidInput() {
+        static const Input INVALID_INPUT = Input(0x7fffffff);
+        return INVALID_INPUT;
+    }
 }
 
diff --git a/libraries/controllers/src/controllers/Input.h b/libraries/controllers/src/controllers/Input.h
index b74ad48c6f..3ca4076de2 100644
--- a/libraries/controllers/src/controllers/Input.h
+++ b/libraries/controllers/src/controllers/Input.h
@@ -83,6 +83,8 @@ struct Input {
 
     using NamedPair = QPair<Input, QString>;
     using NamedVector = QVector<NamedPair>;
+
+    static const Input& invalidInput();
 };
 
 }
diff --git a/libraries/controllers/src/controllers/UserInputMapper.cpp b/libraries/controllers/src/controllers/UserInputMapper.cpp
index 79f4325ae6..29f011fba2 100755
--- a/libraries/controllers/src/controllers/UserInputMapper.cpp
+++ b/libraries/controllers/src/controllers/UserInputMapper.cpp
@@ -47,8 +47,8 @@
 
 namespace controller {
     const uint16_t UserInputMapper::STANDARD_DEVICE = 0;
-    const uint16_t UserInputMapper::ACTIONS_DEVICE = Input::INVALID_DEVICE - 0x00FF;
-    const uint16_t UserInputMapper::STATE_DEVICE = Input::INVALID_DEVICE - 0x0100;
+    const uint16_t UserInputMapper::ACTIONS_DEVICE = Input::invalidInput().device - 0x00FF;
+    const uint16_t UserInputMapper::STATE_DEVICE = Input::invalidInput().device - 0x0100;
 }
 
 // Default contruct allocate the poutput size with the current hardcoded action channels