From d4db8e32e63626efdd3d2000ad68cd9636d6c382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Fri, 16 Aug 2019 21:04:29 +0200
Subject: [PATCH] Minor Hosts Fixes

---
 gui/src/mainwindow.cpp       | 26 +++++++++++++-------------
 gui/src/serveritemwidget.cpp |  2 +-
 gui/src/settings.cpp         |  1 +
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/gui/src/mainwindow.cpp b/gui/src/mainwindow.cpp
index c099d0f..107b8bc 100644
--- a/gui/src/mainwindow.cpp
+++ b/gui/src/mainwindow.cpp
@@ -158,6 +158,19 @@ void MainWindow::UpdateDisplayServers()
 {
 	display_servers.clear();
 
+	for(const auto &host : discovery_manager.GetHosts())
+	{
+		DisplayServer server;
+		server.discovered = true;
+		server.discovery_host = host;
+
+		server.registered = settings->GetRegisteredHostRegistered(host.GetHostMAC());
+		if(server.registered)
+			server.registered_host = settings->GetRegisteredHost(host.GetHostMAC());
+
+		display_servers.append(server);
+	}
+
 	for(const auto &host : settings->GetManualHosts())
 	{
 		DisplayServer server;
@@ -174,19 +187,6 @@ void MainWindow::UpdateDisplayServers()
 		display_servers.append(server);
 	}
 	
-	for(const auto &host : discovery_manager.GetHosts())
-	{
-		DisplayServer server;
-		server.discovered = true;
-		server.discovery_host = host;
-
-		server.registered = settings->GetRegisteredHostRegistered(host.GetHostMAC());
-		if(server.registered)
-			server.registered_host = settings->GetRegisteredHost(host.GetHostMAC());
-
-		display_servers.append(server);
-	}
-	
 	UpdateServerWidgets();
 }
 
diff --git a/gui/src/serveritemwidget.cpp b/gui/src/serveritemwidget.cpp
index a6c1df0..2ced644 100644
--- a/gui/src/serveritemwidget.cpp
+++ b/gui/src/serveritemwidget.cpp
@@ -73,7 +73,7 @@ void ServerItemWidget::Update(const DisplayServer &display_server)
 
 	if(display_server.discovered || display_server.registered)
 	{
-		top_text += display_server.discovered ? display_server.discovery_host.host_name : display_server.registered_host.GetPS4Nickname() + "\n";
+		top_text += (display_server.discovered ? display_server.discovery_host.host_name : display_server.registered_host.GetPS4Nickname()) + "\n";
 	}
 
 	top_text += tr("Address: %1").arg(display_server.GetHostAddr());
diff --git a/gui/src/settings.cpp b/gui/src/settings.cpp
index c60f260..b68a527 100644
--- a/gui/src/settings.cpp
+++ b/gui/src/settings.cpp
@@ -157,6 +157,7 @@ int Settings::SetManualHost(const ManualHost &host)
 	ManualHost save_host(id, host);
 	manual_hosts[id] = save_host;
 	SaveManualHosts();
+	emit ManualHostsUpdated();
 	return id;
 }