From 69651b3f91f1b03fa232bbfef0dba1c698f630b1 Mon Sep 17 00:00:00 2001
From: Adam Honse <calcprogrammer1@gmail.com>
Date: Fri, 20 Mar 2020 13:50:54 -0500
Subject: [PATCH] Load sizes for variable-size controllers in CLI mode

---
 cli.cpp  |  9 ++++-----
 main.cpp | 12 ++++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/cli.cpp b/cli.cpp
index a42a2844..d7d314b6 100644
--- a/cli.cpp
+++ b/cli.cpp
@@ -7,8 +7,7 @@
 #include "RGBController.h"
 #include "i2c_smbus.h"
 
-extern std::vector<i2c_smbus_interface*> busses;
-extern std::vector<RGBController*> rgb_controllers;
+static std::vector<RGBController*> rgb_controllers;
 
 struct DeviceOptions
 {
@@ -325,8 +324,10 @@ void ApplyOptions(DeviceOptions& options)
     }
 }
 
-int cli_main(int argc, char *argv[])
+int cli_main(int argc, char *argv[], std::vector<RGBController *> rgb_controllers_in)
 {
+    rgb_controllers = rgb_controllers_in;
+    
     if (argc == 2 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")))
     {
         PrintHelp();
@@ -339,8 +340,6 @@ int cli_main(int argc, char *argv[])
         return 0;
     }
 
-    DetectRGBControllers();
-
     Options options;
     if (!ProcessOptions(argc, argv, &options))
     {
diff --git a/main.cpp b/main.cpp
index 5836b1d0..21381cb0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -21,7 +21,7 @@ extern std::vector<i2c_smbus_interface*> busses;
 extern std::vector<RGBController*> rgb_controllers;
 
 // See cli.cpp
-extern int cli_main(int argc, char *argv[]);
+extern int cli_main(int argc, char *argv[], std::vector<RGBController *> rgb_controllers_in);
 
 /******************************************************************************************\
 *                                                                                          *
@@ -35,15 +35,15 @@ int main(int argc, char* argv[])
 {
     ProfileManager profile_manager(rgb_controllers);
     
-    if (argc > 1 && strcmp(argv[1], "--gui"))
-    {
-        return cli_main(argc, argv);
-    }
-
     DetectRGBControllers();
 
     profile_manager.LoadSizeFromProfile("sizes.ors");
 
+    if (argc > 1 && strcmp(argv[1], "--gui"))
+    {
+        return cli_main(argc, argv, rgb_controllers);
+    }
+
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QApplication a(argc, argv);