ash/Anemone3DS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved merge conflicts

Browse Source
This commit is contained in:
Alex Taber
2017-09-02 10:08:52 -04:00
parent 9442afb608 91f54ff22e
commit aac093f466
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -25,5 +25,5 @@ Special thanks go to these people who, while not directly contributing, helped i
* the maintainers for all used libraries, including ctrulib, zlib, citro3d, pp2d and minizip. * the maintainers for all used libraries, including ctrulib, zlib, citro3d, pp2d and minizip.
* all the people who helped keep me going and motivated me to work. This includes, but is definitely not limited to: * all the people who helped keep me going and motivated me to work. This includes, but is definitely not limited to:
* The members of the [Nintendo Homebrew Discord](https://discord.gg/C29hYvh) * The members of the [Nintendo Homebrew Discord](https://discord.gg/C29hYvh)
* The members of the Secret Shack Service Discord   * The members of the Secret Shack Service Discord
* The members of the ThemePlaza Discord   * The members of the [ThemePlaza Discord](https://discord.gg/2hUQwXz)

13
source/main.c
View File

@@ -93,9 +93,14 @@ int main(void)
if (kDown & KEY_START) if (kDown & KEY_START)
{ {
exit_screens(); if(!envIsHomebrew())
exit_services(); {
APT_HardwareResetAsync(); srvPublishToSubscriber(0x202, 0);
}
else
{
break;
}
} }
else if (kDown & KEY_L) else if (kDown & KEY_L)
{ {
@@ -240,6 +245,6 @@ int main(void)
} }
free(themes_list); free(themes_list);
exit_services();
return 0; return 0;
} }