From 906c07e4fd7735815548319419b0e8c0db7b85c6 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Thu, 7 Aug 2025 19:25:41 -0400
Subject: [PATCH] fix: MainWindow::setHostName only check if the screen is
 existing when in server mode, In severmode update the serverConfig serverName
 to prevent a case where the server screen is on the grid with the old name
 breaking the layout

---
 src/lib/gui/MainWindow.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp
index 1f12ad9db..4cb40dc74 100644
--- a/src/lib/gui/MainWindow.cpp
+++ b/src/lib/gui/MainWindow.cpp
@@ -1106,7 +1106,14 @@ void MainWindow::setHostName()
 
   QString text = ui->lineEditName->text();
   const auto screenName = Settings::value(Settings::Core::ScreenName).toString();
-  bool existingScreen = serverConfig().screenExists(text) && (text != screenName);
+
+  if (text == screenName)
+    return;
+
+  const bool isServer = ui->rbModeServer->isChecked();
+  bool existingScreen = false;
+  if (isServer)
+    existingScreen = serverConfig().screenExists(text);
 
   if (!ui->lineEditName->hasAcceptableInput() || text.isEmpty() || existingScreen) {
     blockSignals(true);
@@ -1131,6 +1138,8 @@ void MainWindow::setHostName()
 
   ui->lblComputerName->setText(ui->lineEditName->text());
   Settings::setValue(Settings::Core::ScreenName, ui->lineEditName->text());
+  if (isServer)
+    serverConfig().updateServerName();
   applyConfig();
 }