diff --git a/Makefile b/Makefile index 6cf751e..ed3a085 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ DATA := data INCLUDES := include lib/zipper/include APP_TITLE := All-in-One Switch Updater APP_AUTHOR := HamletDuFromage -APP_VERSION := 1.4.0 +APP_VERSION := 1.4.1 TARGET := $(notdir $(CURDIR))-v$(APP_VERSION) ROMFS := resources @@ -78,7 +78,7 @@ CXXFLAGS := $(CFLAGS) -std=gnu++17 -fexceptions -Wno-reorder ASFLAGS := -g $(ARCH) 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` #--------------------------------------------------------------------------------- diff --git a/source/net_page.cpp b/source/net_page.cpp index e8c9691..70f5d59 100644 --- a/source/net_page.cpp +++ b/source/net_page.cpp @@ -22,10 +22,15 @@ NetPage::NetPage() : AppletFrame(true, true) std::string labelText = ""; if(uuid){ - 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) - +"\nMTU: " + std::to_string(unsigned(profile.ip_setting_data.mtu)); + if(profile.ip_setting_data.ip_address_setting.is_automatic){ + labelText += "IP Adress: Automatic"; + } + 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){ labelText += "\nDNS: Automatic";