Lots of logging and cleanup.

This commit is contained in:
Henrik Rydgård committed 2025-04-07 21:40:52 +02:00
1 parent ec6ea05c9b
commit 5f7b698012
8 files changed
+135 -58

No files matched your search

+15 -13
View File
@@ -281,14 +281,15 @@ void GamePauseScreen::update() {
}
const bool networkConnected = IsNetworkConnected();
if (g_netInited != lastNetInited_ || netInetInited != lastNetInetInited_ || lastAdhocServerConnected_ != g_adhocServerConnected || lastOnline_ != networkConnected || lastDNSConfigLoaded_ != g_infraDNSConfig.loaded) {
const InfraDNSConfig &dnsConfig = GetInfraDNSConfig();
if (g_netInited != lastNetInited_ || netInetInited != lastNetInetInited_ || lastAdhocServerConnected_ != g_adhocServerConnected || lastOnline_ != networkConnected || lastDNSConfigLoaded_ != dnsConfig.loaded) {
INFO_LOG(Log::sceNet, "Network status changed, recreating views");
RecreateViews();
lastNetInetInited_ = netInetInited;
lastNetInited_ = g_netInited;
lastAdhocServerConnected_ = g_adhocServerConnected;
lastOnline_ = networkConnected;
lastDNSConfigLoaded_ = g_infraDNSConfig.loaded;
lastDNSConfigLoaded_ = dnsConfig.loaded;
}
const bool mustRunBehind = MustRunBehind();
@@ -394,29 +395,30 @@ void GamePauseScreen::CreateViews() {
if (IsNetworkConnected()) {
leftColumnItems->Add(new NoticeView(NoticeLevel::INFO, nw->T("Network connected"), ""));
if (g_infraDNSConfig.loaded && __NetApctlConnected()) {
const InfraDNSConfig &dnsConfig = GetInfraDNSConfig();
if (dnsConfig.loaded && __NetApctlConnected()) {
leftColumnItems->Add(new NoticeView(NoticeLevel::INFO, nw->T("Infrastructure"), ""));
if (g_infraDNSConfig.state == InfraGameState::NotWorking) {
if (dnsConfig.state == InfraGameState::NotWorking) {
leftColumnItems->Add(new NoticeView(NoticeLevel::WARN, nw->T("Some network functionality in this game is not working"), ""));
if (!g_infraDNSConfig.workingIDs.empty()) {
if (!dnsConfig.workingIDs.empty()) {
std::string str(nw->T("Other versions of this game that should work:"));
for (auto &id : g_infraDNSConfig.workingIDs) {
for (auto &id : dnsConfig.workingIDs) {
str.append("\n - ");
str += id;
}
leftColumnItems->Add(new TextView(str));
}
} else if (g_infraDNSConfig.state == InfraGameState::Unknown) {
} else if (dnsConfig.state == InfraGameState::Unknown) {
leftColumnItems->Add(new NoticeView(NoticeLevel::WARN, nw->T("Network functionality in this game is not guaranteed"), ""));
}
if (!g_infraDNSConfig.revivalTeam.empty()) {
if (!dnsConfig.revivalTeam.empty()) {
leftColumnItems->Add(new TextView(std::string(nw->T("Infrastructure server provided by:"))));
leftColumnItems->Add(new TextView(g_infraDNSConfig.revivalTeam));
if (!g_infraDNSConfig.revivalTeamURL.empty()) {
leftColumnItems->Add(new Button(g_infraDNSConfig.revivalTeamURL))->OnClick.Add([](UI::EventParams &e) {
if (!g_infraDNSConfig.revivalTeamURL.empty()) {
System_LaunchUrl(LaunchUrlType::BROWSER_URL, g_infraDNSConfig.revivalTeamURL.c_str());
leftColumnItems->Add(new TextView(dnsConfig.revivalTeam));
if (!dnsConfig.revivalTeamURL.empty()) {
leftColumnItems->Add(new Button(dnsConfig.revivalTeamURL))->OnClick.Add([&dnsConfig](UI::EventParams &e) {
if (!dnsConfig.revivalTeamURL.empty()) {
System_LaunchUrl(LaunchUrlType::BROWSER_URL, dnsConfig.revivalTeamURL.c_str());
}
return UI::EVENT_DONE;
});