From 2346ed70af3e08fd44febe586aa30a4edc1c2ef6 Mon Sep 17 00:00:00 2001
From: reionwong <reionwong@gmail.com>
Date: Thu, 18 Nov 2021 18:41:28 +0800
Subject: [PATCH] Session: Fix startup sequence

---
 powerman/dimdisplayaction.cpp | 3 +++
 session/processmanager.cpp    | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/powerman/dimdisplayaction.cpp b/powerman/dimdisplayaction.cpp
index 4001efe..afdff86 100644
--- a/powerman/dimdisplayaction.cpp
+++ b/powerman/dimdisplayaction.cpp
@@ -49,6 +49,9 @@ void DimDisplayAction::onWakeupFromIdle()
         return;
     }
 
+    if (m_oldScreenBrightness < 0)
+        m_oldScreenBrightness = 1;
+
     // An active inhibition may not let us restore the brightness.
     // We should wait a bit screen to wake-up from sleep
     QTimer::singleShot(0, this, [this]() {
diff --git a/session/processmanager.cpp b/session/processmanager.cpp
index 34fd308..9789b06 100644
--- a/session/processmanager.cpp
+++ b/session/processmanager.cpp
@@ -63,8 +63,6 @@ void ProcessManager::start()
 {
     startWindowManager();
     startDaemonProcess();
-
-    QTimer::singleShot(100, this, &ProcessManager::loadAutoStartProcess);
 }
 
 void ProcessManager::logout()
@@ -152,6 +150,9 @@ void ProcessManager::startDesktopProcess()
             process->deleteLater();
         }
     }
+
+    // Auto start
+    QTimer::singleShot(100, this, &ProcessManager::loadAutoStartProcess);
 }
 
 void ProcessManager::startDaemonProcess()