mirrors/AIO-switch-updater
1
0
Fork 0
mirror of https://github.com/HamletDuFromage/aio-switch-updater.git synced 2024-11-28 12:22:02 +00:00
Code Issues Releases Activity

fixed misleading display in internet settings page

Browse source
This commit is contained in:
flb 2021-01-03 14:14:35 +01:00
parent 59ce4124a7
commit a2843d841f
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -45,7 +45,7 @@ DATA := data
INCLUDES := include lib/zipper/include INCLUDES := include lib/zipper/include
APP_TITLE := All-in-One Switch Updater APP_TITLE := All-in-One Switch Updater
APP_AUTHOR := HamletDuFromage APP_AUTHOR := HamletDuFromage
APP_VERSION := 1.4.0 APP_VERSION := 1.4.1
TARGET := $(notdir $(CURDIR))-v$(APP_VERSION) TARGET := $(notdir $(CURDIR))-v$(APP_VERSION)
ROMFS := resources ROMFS := resources
@ -78,7 +78,7 @@ CXXFLAGS := $(CFLAGS) -std=gnu++17 -fexceptions -Wno-reorder
ASFLAGS := -g $(ARCH) ASFLAGS := -g $(ARCH)
LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
LIBS := -lm -lcurl -lnx -lz -lmbedtls -lmbedx509 -lmbedcrypto -lstdc++fs `freetype-config --libs` LIBS := -lm -lcurl -lnx -lz -lmbedtls -lmbedx509 -lmbedcrypto -lstdc++fs
#LIBS := -ltwili -lm -lcurl -lnx -lz -lmbedtls -lmbedx509 -lmbedcrypto -lstdc++fs `freetype-config --libs` #LIBS := -ltwili -lm -lcurl -lnx -lz -lmbedtls -lmbedx509 -lmbedcrypto -lstdc++fs `freetype-config --libs`
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

13
source/net_page.cpp
View file

@ -22,10 +22,15 @@ NetPage::NetPage() : AppletFrame(true, true)
std::string labelText = ""; std::string labelText = "";
if(uuid){ if(uuid){
labelText = "IP Adress: " + ipToString(profile.ip_setting_data.ip_address_setting.current_addr.addr) if(profile.ip_setting_data.ip_address_setting.is_automatic){
+"\nSubnet Mask: " + ipToString(profile.ip_setting_data.ip_address_setting.subnet_mask.addr) labelText += "IP Adress: Automatic";
+"\nGateway: " + ipToString(profile.ip_setting_data.ip_address_setting.gateway.addr) }
+"\nMTU: " + std::to_string(unsigned(profile.ip_setting_data.mtu)); else{
labelText = "IP Adress: " + ipToString(profile.ip_setting_data.ip_address_setting.current_addr.addr)
+"\nSubnet Mask: " + ipToString(profile.ip_setting_data.ip_address_setting.subnet_mask.addr)
+"\nGateway: " + ipToString(profile.ip_setting_data.ip_address_setting.gateway.addr);
}
labelText += "\nMTU: " + std::to_string(unsigned(profile.ip_setting_data.mtu));
if(profile.ip_setting_data.dns_setting.is_automatic){ if(profile.ip_setting_data.dns_setting.is_automatic){
labelText += "\nDNS: Automatic"; labelText += "\nDNS: Automatic";