Resolved merge conflicts

2017-09-02 10:08:52 -04:00
parent 9442afb608 91f54ff22e
commit aac093f466
2 changed files with 11 additions and 6 deletions
--- a/source/main.c
+++ b/source/main.c
@@ -93,9 +93,14 @@ int main(void)
        
        if (kDown & KEY_START)
        {
-            exit_screens();
-            exit_services();
-            APT_HardwareResetAsync();
+            if(!envIsHomebrew()) 
+            {
+                srvPublishToSubscriber(0x202, 0);
+            } 
+            else 
+            {
+                break;
+            }
        }
        else if (kDown & KEY_L)
        {
@@ -240,6 +245,6 @@ int main(void)
    }
    
    free(themes_list);
-        
+    exit_services();
    return 0;
 }