Fixed a compiler error on the latest version of LibNX

This commit is contained in:
Nixienea 2020-10-13 13:49:40 +02:00
parent b20e374e12
commit abb57356f8

View file

@ -70,9 +70,9 @@ namespace ui {
this->settingsMenu->ClearItems(); this->settingsMenu->ClearItems();
this->settingsMenu->SetSelectedIndex(0); this->settingsMenu->SetSelectedIndex(0);
char consolename[SET_MAX_NICKNAME_SIZE] = {}; SetSysDeviceNickName consolename = {};
setsysGetDeviceNickname(consolename); setsysGetDeviceNickname(&consolename);
this->PushSettingItem(cfg::GetLanguageString(g_Config.main_lang, g_Config.default_lang, "set_console_nickname"), EncodeForSettings<std::string>(consolename), 0); this->PushSettingItem(cfg::GetLanguageString(g_Config.main_lang, g_Config.default_lang, "set_console_nickname"), EncodeForSettings<std::string>(consolename.nickname), 0);
TimeLocationName loc = {}; TimeLocationName loc = {};
timeGetDeviceLocationName(&loc); timeGetDeviceLocationName(&loc);
this->PushSettingItem(cfg::GetLanguageString(g_Config.main_lang, g_Config.default_lang, "set_console_timezone"), EncodeForSettings<std::string>(loc.name), -1); this->PushSettingItem(cfg::GetLanguageString(g_Config.main_lang, g_Config.default_lang, "set_console_timezone"), EncodeForSettings<std::string>(loc.name), -1);
@ -140,15 +140,15 @@ namespace ui {
SwkbdConfig swkbd; SwkbdConfig swkbd;
swkbdCreate(&swkbd, 0); swkbdCreate(&swkbd, 0);
swkbdConfigSetGuideText(&swkbd, cfg::GetLanguageString(g_Config.main_lang, g_Config.default_lang, "swkbd_console_nick_guide").c_str()); swkbdConfigSetGuideText(&swkbd, cfg::GetLanguageString(g_Config.main_lang, g_Config.default_lang, "swkbd_console_nick_guide").c_str());
char consolename[SET_MAX_NICKNAME_SIZE] = {}; SetSysDeviceNickName consolename = {};
setsysGetDeviceNickname(consolename); setsysGetDeviceNickname(&consolename);
swkbdConfigSetInitialText(&swkbd, consolename); swkbdConfigSetInitialText(&swkbd, consolename.nickname);
swkbdConfigSetStringLenMax(&swkbd, 32); swkbdConfigSetStringLenMax(&swkbd, 32);
char name[SET_MAX_NICKNAME_SIZE] = {0}; SetSysDeviceNickName name = { {0} };
auto rc = swkbdShow(&swkbd, name, SET_MAX_NICKNAME_SIZE); auto rc = swkbdShow(&swkbd, name.nickname, 0x80);
swkbdClose(&swkbd); swkbdClose(&swkbd);
if(R_SUCCEEDED(rc)) { if(R_SUCCEEDED(rc)) {
setsysSetDeviceNickname(name); setsysSetDeviceNickname(&name);
reload_need = true; reload_need = true;
} }
break; break;