summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcpasjuste <cpasjuste@gmail.com>2020-04-24 13:36:18 +0200
committercpasjuste <cpasjuste@gmail.com>2020-04-24 13:36:18 +0200
commitc4fad09b3d29679b15d456f6cc0d61b0f59a8d4c (patch)
treea33de9a6c741755362127b9fae9e6e33ebd864ae
parentfae5ba054cf9b82da218cfc4df7686f13d3107d3 (diff)
downloadplus-c4fad09b3d29679b15d456f6cc0d61b0f59a8d4c.tar.gz
plus-c4fad09b3d29679b15d456f6cc0d61b0f59a8d4c.tar.bz2
plus-c4fad09b3d29679b15d456f6cc0d61b0f59a8d4c.tar.xz
plus-c4fad09b3d29679b15d456f6cc0d61b0f59a8d4c.zip
switch: don't use atexit not working on switch
-rw-r--r--src/maingui.cpp4
-rw-r--r--src/progs/manaplus/client.cpp3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/maingui.cpp b/src/maingui.cpp
index f10c0efe7..8b0ddd218 100644
--- a/src/maingui.cpp
+++ b/src/maingui.cpp
@@ -192,6 +192,10 @@ int mainGui(int argc, char *argv[])
#endif // SDL_IMAGE_VERSION_ATLEAST(1, 2, 11)
#ifdef __SWITCH__
+ SDL_Quit();
+#endif
+
+#ifdef __SWITCH__
NxDeinit();
#endif
diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp
index 772975214..cea2d10af 100644
--- a/src/progs/manaplus/client.cpp
+++ b/src/progs/manaplus/client.cpp
@@ -387,8 +387,9 @@ void Client::gameInit()
logger->safeError(strprintf("Could not initialize SDL: %s",
SDL_GetError()));
}
+#ifndef __SWITCH__
atexit(SDL_Quit);
-
+#endif
PacketLimiter::initPacketLimiter();
#ifndef USE_SDL2
SDL_EnableUNICODE(1);