Minor Hosts Fixes

This commit is contained in:
Florian Märkl 2019-08-16 21:04:29 +02:00
commit d4db8e32e6
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
3 changed files with 15 additions and 14 deletions

View file

@ -158,6 +158,19 @@ void MainWindow::UpdateDisplayServers()
{ {
display_servers.clear(); 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()) for(const auto &host : settings->GetManualHosts())
{ {
DisplayServer server; DisplayServer server;
@ -174,19 +187,6 @@ void MainWindow::UpdateDisplayServers()
display_servers.append(server); 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(); UpdateServerWidgets();
} }

View file

@ -73,7 +73,7 @@ void ServerItemWidget::Update(const DisplayServer &display_server)
if(display_server.discovered || display_server.registered) 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()); top_text += tr("Address: %1").arg(display_server.GetHostAddr());

View file

@ -157,6 +157,7 @@ int Settings::SetManualHost(const ManualHost &host)
ManualHost save_host(id, host); ManualHost save_host(id, host);
manual_hosts[id] = save_host; manual_hosts[id] = save_host;
SaveManualHosts(); SaveManualHosts();
emit ManualHostsUpdated();
return id; return id;
} }