From 956580c606712b924aa6be49e777c668aabd0271 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 1 Nov 2015 11:18:28 +0100
Subject: [PATCH] Cleanups

---
 command_event.c        | 2 ++
 menu/cbs/menu_cbs_ok.c | 1 -
 string_list_special.c  | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/command_event.c b/command_event.c
index b909b80d5d..769a24eee1 100644
--- a/command_event.c
+++ b/command_event.c
@@ -1422,9 +1422,11 @@ bool event_command(enum event_command cmd)
          rarch_ctl(RARCH_ACTION_STATE_FORCE_QUIT, NULL);
          break;
       case EVENT_CMD_SHUTDOWN:
+#if defined(__linux__) && !defined(ANDROID)
          rarch_main_msg_queue_push("Shutting down...", 1, 180, true);
          rarch_ctl(RARCH_ACTION_STATE_FORCE_QUIT, NULL);
          system("shutdown -P now");
+#endif
          break;
       case EVENT_CMD_RESUME:
          rarch_ctl(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED, NULL);
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index c7c066e666..ea1cd10824 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1710,7 +1710,6 @@ static int action_ok_load_archive_detect_core(const char *path,
          if (ret == -1)
             action_ok_push_quick_menu();
          return ret;
-   return 0;
       case 0:
          return generic_action_ok_displaylist_push(path, label, type,
                selection, entry_idx, ACTION_OK_DL_DEFERRED_CORE_LIST);
diff --git a/string_list_special.c b/string_list_special.c
index 4fa36d734c..e7aa0d09c2 100644
--- a/string_list_special.c
+++ b/string_list_special.c
@@ -210,7 +210,6 @@ struct string_list *string_list_new_special(enum string_list_type type,
             string_list_append(s, opt, attr);
          }
          break;
-         break;
       case STRING_LIST_CORES_NAMES:
          for (i = 0; i < core_info_list_num_info_files(global->core_info.list); i++)
          {