Mirrors/Checkpoint
2
0
Fork 0
mirror of https://github.com/BernardoGiordano/Checkpoint synced 2024-11-13 21:27:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

This changes seem stable

Browse source
This commit is contained in:
BernardoGiordano 2019-07-24 21:02:27 +02:00
parent 70a493e89a
commit f9a81993e0
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
switch/source/util.cpp
View file

@ -28,19 +28,8 @@
void servicesExit(void)
{
ftp_exit();
nifmExit();
// socketExit();
freeIcons();
if (g_notificationLedAvailable) {
hidsysExit();
}
nsExit();
Account::exit();
socketExit();
SDLH_Exit();
plExit();
romfsExit();
}
Result servicesInit(void)
@ -53,20 +42,21 @@ Result servicesInit(void)
return -1;
}
// debug
Result socinit = 0;
if ((socinit = socketInitializeDefault()) == 0) {
ATEXIT(socketExit);
// nxlinkStdio();
}
else {
Logger::getInstance().log(Logger::INFO, "Unable to socketInitialize. Result code %X", socinit);
Logger::getInstance().log(Logger::INFO, "Unable to initialize socket. Result code %X", socinit);
}
g_shouldExitNetworkLoop = R_FAILED(socinit);
Result res = 0;
romfsInit();
ATEXIT(romfsExit);
io::createDirectory("sdmc:/switch");
io::createDirectory("sdmc:/switch/Checkpoint");
io::createDirectory("sdmc:/switch/Checkpoint/saves");
@ -76,24 +66,29 @@ Result servicesInit(void)
Logger::getInstance().log(Logger::ERROR, "plInitialize failed. Result code %X", res);
return res;
}
ATEXIT(plExit);
if (R_FAILED(res = Account::init())) {
Logger::getInstance().log(Logger::ERROR, "Account::init failed. Result code %X", res);
return res;
}
ATEXIT(Account::exit);
if (R_FAILED(res = nsInitialize())) {
Logger::getInstance().log(Logger::ERROR, "nsInitialize failed. Result code %X", res);
return res;
}
ATEXIT(nsExit);
if (!SDLH_Init()) {
Logger::getInstance().log(Logger::ERROR, "SDLH_Init failed. Result code %X", res);
return -1;
}
ATEXIT(freeIcons);
if (R_SUCCEEDED(res = hidsysInitialize())) {
g_notificationLedAvailable = true;
ATEXIT(hidsysExit);
}
else {
Logger::getInstance().log(Logger::INFO, "Notification led not available. Result code %X", res);
@ -101,8 +96,9 @@ Result servicesInit(void)
Configuration::getInstance();
if (R_SUCCEEDED(socinit) && R_SUCCEEDED(res = nifmInitialize())) {
if (R_SUCCEEDED(socinit)) {
if (R_SUCCEEDED(res = ftp_init())) {
ATEXIT(ftp_exit);
g_ftpAvailable = true;
Logger::getInstance().log(Logger::INFO, "FTP Server successfully loaded.");
}
@ -110,9 +106,6 @@ Result servicesInit(void)
Logger::getInstance().log(Logger::INFO, "FTP Server failed to load. Result code %X", res);
}
}
else {
Logger::getInstance().log(Logger::INFO, "Socket not initialized or nifmInitialize error. Result code %X", res);
}
Logger::getInstance().log(Logger::INFO, "Checkpoint loading completed!");