From 047451696aac0514abfb849ee02d5f69336e6ab5 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Sat, 4 Apr 2026 13:12:21 -0400
Subject: [PATCH] refactor: Messages::showFirstConnectionMessage check the
 settings for the values

---
 src/lib/gui/MainWindow.cpp |  8 +-------
 src/lib/gui/Messages.cpp   | 10 ++++++----
 src/lib/gui/Messages.h     |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp
index 9e36eca6b..b13e58b17 100644
--- a/src/lib/gui/MainWindow.cpp
+++ b/src/lib/gui/MainWindow.cpp
@@ -858,13 +858,7 @@ void MainWindow::showFirstConnectedMessage()
   if (Settings::value(Settings::Gui::ShownFirstConnectedMessage).toBool())
     return;
   Settings::setValue(Settings::Gui::ShownFirstConnectedMessage, true);
-
-  const auto isServer = m_coreProcess.mode() == CoreMode::Server;
-  const auto closeToTray = Settings::value(Settings::Gui::CloseToTray).toBool();
-
-  using ProcessMode = Settings::ProcessMode;
-  const auto enableService = Settings::value(Settings::Core::ProcessMode).value<ProcessMode>() == ProcessMode::Service;
-  messages::showFirstConnectedMessage(this, closeToTray, enableService, isServer);
+  messages::showFirstConnectedMessage(this);
 }
 
 void MainWindow::updateStatus()
diff --git a/src/lib/gui/Messages.cpp b/src/lib/gui/Messages.cpp
index f9c8df874..7a81df80a 100644
--- a/src/lib/gui/Messages.cpp
+++ b/src/lib/gui/Messages.cpp
@@ -142,12 +142,11 @@ void showFirstServerStartMessage(QWidget *parent)
   );
 }
 
-void showFirstConnectedMessage(QWidget *parent, bool closeToTray, bool enableService, bool isServer)
+void showFirstConnectedMessage(QWidget *parent)
 {
-
   auto message = QObject::tr("<p>%1 is now connected!</p>").arg(kAppName);
 
-  if (isServer) {
+  if (Settings::value(Settings::Core::CoreMode).value<Settings::CoreMode>() == Settings::Server) {
     message.append(
         QObject::tr(
             "<p>Try moving your mouse to your other computer. Once there, go ahead "
@@ -159,7 +158,10 @@ void showFirstConnectedMessage(QWidget *parent, bool closeToTray, bool enableSer
     message.append(QObject::tr("<p>Try controlling this computer remotely.</p>"));
   }
 
-  if (!closeToTray && !enableService) {
+  using ProcessMode = Settings::ProcessMode;
+
+  if (Settings::value(Settings::Core::ProcessMode).value<ProcessMode>() == ProcessMode::Desktop &&
+      !Settings::value(Settings::Gui::CloseToTray).toBool()) {
     message.append(
         QObject::tr(
             "<p>As you do not have the setting enabled to keep %1 running in "
diff --git a/src/lib/gui/Messages.h b/src/lib/gui/Messages.h
index 5e36aec34..d2bb88c87 100644
--- a/src/lib/gui/Messages.h
+++ b/src/lib/gui/Messages.h
@@ -21,7 +21,7 @@ void raiseCriticalDialog();
 
 void showFirstServerStartMessage(QWidget *parent);
 
-void showFirstConnectedMessage(QWidget *parent, bool closeToTray, bool enableService, bool isServer);
+void showFirstConnectedMessage(QWidget *parent);
 
 void showCloseReminder(QWidget *parent);