From 6743d5bc78741855e8d8832c8064b5328a4758cc Mon Sep 17 00:00:00 2001
From: Luke D Jones <luke@ljones.dev>
Date: Wed, 10 Mar 2021 18:42:44 +1300
Subject: [PATCH] Add display-manager restart check

---
 daemon/src/ctrl_gfx/gfx.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/daemon/src/ctrl_gfx/gfx.rs b/daemon/src/ctrl_gfx/gfx.rs
index c9430c96..d9dceb78 100644
--- a/daemon/src/ctrl_gfx/gfx.rs
+++ b/daemon/src/ctrl_gfx/gfx.rs
@@ -317,25 +317,25 @@ impl CtrlGraphics {
         Ok(())
     }
 
-    fn wait_display_manager_inactive() -> Result<(), RogError> {
+    fn wait_display_manager_state(state: &str) -> Result<(), RogError> {
         let mut cmd = Command::new("systemctl");
         cmd.arg("is-active");
         cmd.arg(DISPLAY_MANAGER);
 
         let mut count = 0;
 
-        while count <= 4 {
+        while count <= 5 {
             let output = cmd
                 .output()
                 .map_err(|err| RogError::Command(format!("{:?}", cmd), err))?;
-            if output.stdout.starts_with("inactive".as_bytes()) {
+            if output.stdout.starts_with(state.as_bytes()) {
                 return Ok(());
             }
             std::thread::sleep(std::time::Duration::from_millis(500));
             count += 1;
         }
         return Err(
-            GfxError::DisplayManager("display-manager did not completely stop".into()).into(),
+            GfxError::DisplayManager(format!("display-manager timed out waiting for {} state", state).into()).into(),
         );
     }
 
@@ -373,9 +373,13 @@ impl CtrlGraphics {
     /// Will stop and start display manager without warning
     pub fn set_gfx_config(&mut self, vendor: GfxVendors) -> Result<String, RogError> {
         Self::do_display_manager_action("stop")?;
-        Self::wait_display_manager_inactive()?;
+        Self::wait_display_manager_state("inactive")?;
         self.do_vendor_tasks(vendor)?;
         Self::do_display_manager_action("start")?;
+        if Self::wait_display_manager_state("active").is_err() {
+            Self::do_display_manager_action("restart")?;
+        }
+        Self::wait_display_manager_state("active")?;
         // TODO: undo if failed? Save last mode, catch errors...
         let v: &str = vendor.into();
         Ok(format!("Graphics mode changed to {} successfully", v))