From 6ce32c1cab965aa114b0926eb7f4874741bbc0d9 Mon Sep 17 00:00:00 2001
From: Luke D Jones <luke@ljones.dev>
Date: Thu, 22 Oct 2020 08:14:21 +1300
Subject: [PATCH] Fix one super silly bug

closes #30
---
 Cargo.lock                 |  4 ++--
 asus-nb-ctrl/src/daemon.rs | 44 +++++++++++++++++++-------------------
 asus-nb/Cargo.toml         |  2 +-
 ctrl-gfx/Cargo.toml        |  2 +-
 data/asus-notify.service   |  2 +-
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9259e0d5..eeb260f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,7 +29,7 @@ checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
 
 [[package]]
 name = "asus-nb"
-version = "2.0.4"
+version = "2.0.5"
 dependencies = [
  "ctrl-gfx",
  "dbus",
@@ -191,7 +191,7 @@ dependencies = [
 
 [[package]]
 name = "ctrl-gfx"
-version = "2.1.1"
+version = "2.1.3"
 dependencies = [
  "log",
  "sysfs-class",
diff --git a/asus-nb-ctrl/src/daemon.rs b/asus-nb-ctrl/src/daemon.rs
index 2c5b353d..74a13c3e 100644
--- a/asus-nb-ctrl/src/daemon.rs
+++ b/asus-nb-ctrl/src/daemon.rs
@@ -80,34 +80,34 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
         }
     }
 
-    match CtrlGraphics::new() {
-        Ok(mut ctrl) => {
-            ctrl.reload()
-                .unwrap_or_else(|err| warn!("Gfx controller: {}", err));
-            ctrl.add_to_server(&mut object_server);
-        }
-        Err(err) => {
-            error!("Gfx control: {}", err);
+    if enable_gfx_switching {
+        match CtrlGraphics::new() {
+            Ok(mut ctrl) => {
+                ctrl.reload()
+                    .unwrap_or_else(|err| warn!("Gfx controller: {}", err));
+                ctrl.add_to_server(&mut object_server);
+            }
+            Err(err) => {
+                error!("Gfx control: {}", err);
+            }
         }
     }
 
     // Collect tasks for task thread
     let mut tasks: Vec<Arc<Mutex<dyn CtrlTask + Send>>> = Vec::new();
 
-    if enable_gfx_switching {
-        match CtrlFanAndCPU::new(config.clone()) {
-            Ok(mut ctrl) => {
-                ctrl.reload()
-                    .unwrap_or_else(|err| warn!("Profile control: {}", err));
-                let tmp = Arc::new(Mutex::new(ctrl));
-                DbusFanAndCpu::new(tmp.clone()).add_to_server(&mut object_server);
-                tasks.push(tmp);
-            }
-            Err(err) => {
-                error!("Profile control: {}", err);
-            }
-        };
-    }
+    match CtrlFanAndCPU::new(config.clone()) {
+        Ok(mut ctrl) => {
+            ctrl.reload()
+                .unwrap_or_else(|err| warn!("Profile control: {}", err));
+            let tmp = Arc::new(Mutex::new(ctrl));
+            DbusFanAndCpu::new(tmp.clone()).add_to_server(&mut object_server);
+            tasks.push(tmp);
+        }
+        Err(err) => {
+            error!("Profile control: {}", err);
+        }
+    };
 
     if let Some(laptop) = laptop {
         let ctrl = CtrlKbdBacklight::new(
diff --git a/asus-nb/Cargo.toml b/asus-nb/Cargo.toml
index eb7eb10e..a182bfac 100644
--- a/asus-nb/Cargo.toml
+++ b/asus-nb/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "asus-nb"
-version = "2.0.4"
+version = "2.0.5"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]
diff --git a/ctrl-gfx/Cargo.toml b/ctrl-gfx/Cargo.toml
index c18eb821..47b35429 100644
--- a/ctrl-gfx/Cargo.toml
+++ b/ctrl-gfx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ctrl-gfx"
-version = "2.1.1"
+version = "2.1.3"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]
diff --git a/data/asus-notify.service b/data/asus-notify.service
index ab0c31bc..076c8c4a 100644
--- a/data/asus-notify.service
+++ b/data/asus-notify.service
@@ -4,9 +4,9 @@ StartLimitInterval=200
 StartLimitBurst=2
 
 [Service]
+ExecStartPre=/usr/bin/sleep 2
 ExecStart=/usr/bin/asus-notify
 Restart=on-failure
-Restart=always
 RestartSec=1
 Type=simple