From 83174b51c407402e8739b6e3fc4cdb44991dbd9d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 2 Jun 2014 22:58:28 +0200
Subject: [PATCH] Correct 'ret' return of process_args at least - 0 is for
 content being loaded, 1 is if content is not loaded

---
 frontend/frontend.c                  | 3 +--
 frontend/platform/platform_android.c | 8 ++++----
 frontend/platform/platform_gx.c      | 4 ++--
 frontend/platform/platform_ps3.c     | 4 ++--
 frontend/platform/platform_psp.c     | 4 ++--
 frontend/platform/platform_xdk.c     | 6 +++---
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/frontend/frontend.c b/frontend/frontend.c
index 31f7324d14..bc8d644e1b 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -328,14 +328,13 @@ returntype main_entry(signature())
    if ((ret = rarch_main_init(argc, argv))) return_var(ret);
 
 #if defined(HAVE_MENU)
-   ret = 0;
    if (driver.frontend_ctx && driver.frontend_ctx->process_args)
       ret = driver.frontend_ctx->process_args(&argc, argv, args);
 
    g_extern.lifecycle_state |= (1ULL << MODE_GAME);
 
 #if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
-   if (ret)
+   if (!ret)
 #endif
    {
       // If we started a ROM directly from command line,
diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c
index 16b05a2262..879c8a6bab 100644
--- a/frontend/platform/platform_android.c
+++ b/frontend/platform/platform_android.c
@@ -672,11 +672,11 @@ static int frontend_android_process_args(int *argc, char *argv[], void *args)
    struct android_app* android_app = (struct android_app*)g_android;
 
    if (!android_app)
-      return 0;
+      return 1;
 
    env = jni_thread_getenv();
    if (!env)
-      return 0;
+      return 1;
 
    CALL_OBJ_METHOD(env, obj, android_app->activity->clazz, android_app->getIntent);
 
@@ -692,10 +692,10 @@ static int frontend_android_process_args(int *argc, char *argv[], void *args)
 
       g_extern.lifecycle_state |= (1ULL << MODE_LOAD_GAME);
       RARCH_LOG("Auto-start game %s.\n", g_extern.fullpath);
-      return 1;
+      return 0;
    }
 
-   return 0;
+   return 1;
 }
 
 const frontend_ctx_driver_t frontend_ctx_android = {
diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c
index b565ded96d..b06538266a 100644
--- a/frontend/platform/platform_gx.c
+++ b/frontend/platform/platform_gx.c
@@ -350,7 +350,7 @@ static void frontend_gx_exitspawn(void)
 
 static int frontend_gx_process_args(int *argc, char *argv[], void *args)
 {
-   int ret = 0;
+   int ret = 1;
 
 #ifndef IS_SALAMANDER
    // a big hack: sometimes salamander doesn't save the new core it loads on first boot,
@@ -365,7 +365,7 @@ static int frontend_gx_process_args(int *argc, char *argv[], void *args)
    if (*argc > 2 && argv[1] != NULL && argv[2] != NULL)
    {
       fill_pathname_join(g_extern.fullpath, argv[1], argv[2], sizeof(g_extern.fullpath));
-      ret = 1;
+      ret = 0;
    }
 #endif
 
diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c
index 01c8ebfcec..57c5be46a6 100644
--- a/frontend/platform/platform_ps3.c
+++ b/frontend/platform/platform_ps3.c
@@ -331,7 +331,7 @@ static void frontend_ps3_init(void *data)
 
 static int frontend_ps3_process_args(int *argc, char *argv[], void *args)
 {
-   int ret = 0;
+   int ret = 1;
 #ifndef IS_SALAMANDER
    bool original_verbose = g_extern.verbose;
    g_extern.verbose = true;
@@ -339,7 +339,7 @@ static int frontend_ps3_process_args(int *argc, char *argv[], void *args)
    if (*argc > 1)
    {
       strlcpy(g_extern.fullpath, argv[1], sizeof(g_extern.fullpath));
-      ret = 1;
+      ret = 0;
       RARCH_LOG("Auto-start game %s.\n", argv[1]);
    }
 
diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c
index f33d146a48..97eaf4bb7e 100644
--- a/frontend/platform/platform_psp.c
+++ b/frontend/platform/platform_psp.c
@@ -116,10 +116,10 @@ static int frontend_psp_process_args(int *argc, char *argv[], void *args)
    {
       strlcpy(g_extern.fullpath, argv[1], sizeof(g_extern.fullpath));
       g_extern.lifecycle_state |= (1ULL << MODE_LOAD_GAME);
-      return 1;
+      return 0;
    }
 
-   return 0;
+   return 1;
 }
 
 static int frontend_psp_get_rating(void)
diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c
index 23bf376616..59ce09483f 100644
--- a/frontend/platform/platform_xdk.c
+++ b/frontend/platform/platform_xdk.c
@@ -287,7 +287,7 @@ static int frontend_xdk_process_args(int *argc, char *argv[], void *args)
    g_extern.verbose = true;
 #endif
 
-   ret = 0;
+   ret = 1;
    (void)argc;
    (void)argv;
 
@@ -304,7 +304,7 @@ static int frontend_xdk_process_args(int *argc, char *argv[], void *args)
       {
          snprintf(g_extern.fullpath, sizeof(g_extern.fullpath), (char*)ptr.Data);
          RARCH_LOG("Auto-start game %s.\n", g_extern.fullpath);
-         ret = 1;
+         ret = 0;
          goto exit;
       }
    }
@@ -319,7 +319,7 @@ static int frontend_xdk_process_args(int *argc, char *argv[], void *args)
       RARCH_LOG("Auto-start game %s.\n", g_extern.fullpath);
 
       delete []pLaunchData;
-      ret = 1;
+      ret = 0;
       goto exit;
    }
 #endif