fix pressing the power button shutting down the console instead of showing the poweroff screen (#123)

This commit is contained in:
LiquidFenrir
2017-12-31 05:01:01 +01:00
committed by Alex Taber
parent a764ea9bed
commit 841773d9e4
2 changed files with 8 additions and 7 deletions

View File

@@ -74,6 +74,4 @@ enum TextureID {
TEXTURE_ICON, // always the last TEXTURE_ICON, // always the last
}; };
void exit_function(void);
#endif #endif

View File

@@ -105,7 +105,7 @@ static void exit_thread(void)
} }
} }
void exit_function(void) void exit_function(bool power_pressed)
{ {
stop_install_check(); stop_install_check();
for(int i = 0; i < MODE_AMOUNT; i++) for(int i = 0; i < MODE_AMOUNT; i++)
@@ -120,7 +120,7 @@ void exit_function(void)
exit_screens(); exit_screens();
exit_services(); exit_services();
if(installed_themes) if(!power_pressed && installed_themes)
{ {
if(homebrew) if(homebrew)
{ {
@@ -361,7 +361,11 @@ int main(void)
pp2d_end_draw(); pp2d_end_draw();
if(kDown & KEY_START) break; if(kDown & KEY_START)
{
exit_function(false);
return 0;
}
if(!install_mode) if(!install_mode)
{ {
@@ -708,7 +712,6 @@ int main(void)
} }
} }
exit_function(); exit_function(true);
return 0; return 0;
} }