From f50332df41bbff43edc9364578c0d27559cfe8e2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 3 Jun 2013 20:42:04 +0200 Subject: [PATCH] (360) Build fix --- frontend/frontend_console.c | 2 ++ frontend/menu/rmenu_xui.cpp | 50 ++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c index fa0c08bb7d..6e29364266 100644 --- a/frontend/frontend_console.c +++ b/frontend/frontend_console.c @@ -82,6 +82,7 @@ static bool libretro_install_core(const char *path_prefix, #define MAKE_DIR(x, name) { \ RARCH_LOG("Checking directory name %s [%s]\n", name, x); \ if (strlen(x) > 0) \ + { \ if (!path_is_directory((x)) )\ { \ RARCH_WARN("Directory \"%s\" does not exists, creating\n", (x)); \ @@ -90,6 +91,7 @@ static bool libretro_install_core(const char *path_prefix, RARCH_ERR("Could not create directory \"%s\"\n", (x)); \ } \ } \ + } \ } int rarch_main(int argc, char *argv[]) diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index 97ff15d051..b06f3eb58a 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -765,6 +765,31 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro switch(current_index) { + case INGAME_MENU_REWIND_ENABLED: + if (input == XUI_CONTROL_NAVIGATE_LEFT) + settings_set(1ULL << S_REWIND); + else if (input == XUI_CONTROL_NAVIGATE_RIGHT || + input == XUI_CONTROL_NAVIGATE_OK) + settings_set(1ULL << S_REWIND); + + if (g_settings.rewind_enable) + rarch_init_rewind(); + else + rarch_deinit_rewind(); + XuiListSetText(m_menulist, INGAME_MENU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF"); + break; + case INGAME_MENU_REWIND_GRANULARITY: + if (input == XUI_CONTROL_NAVIGATE_LEFT) + { + if (g_settings.rewind_granularity > 1) + g_settings.rewind_granularity--; + } + else if (input == XUI_CONTROL_NAVIGATE_RIGHT || + input == XUI_CONTROL_NAVIGATE_OK) + g_settings.rewind_granularity++; + menu_settings_create_menu_item_label_w(strw_buffer, S_LBL_REWIND_GRANULARITY, sizeof(strw_buffer)); + XuiListSetText(m_menulist, INGAME_MENU_REWIND_GRANULARITY, strw_buffer); + break; case SETTING_EMU_SHOW_INFO_MSG: if (input == XUI_CONTROL_NAVIGATE_LEFT) { @@ -1375,31 +1400,6 @@ HRESULT CRetroArchMain::OnControlNavigate(XUIMessageControlNavigate *pControlNav process_input_ret = -1; } break; - case INGAME_MENU_REWIND_ENABLED: - if (input == XUI_CONTROL_NAVIGATE_LEFT) - settings_set(1ULL << S_REWIND); - else if (input == XUI_CONTROL_NAVIGATE_RIGHT || - input == XUI_CONTROL_NAVIGATE_OK) - settings_set(1ULL << S_REWIND); - - if (g_settings.rewind_enable) - rarch_init_rewind(); - else - rarch_deinit_rewind(); - XuiListSetText(m_menulist, INGAME_MENU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF"); - break; - case INGAME_MENU_REWIND_GRANULARITY: - if (input == XUI_CONTROL_NAVIGATE_LEFT) - { - if (g_settings.rewind_granularity > 1) - g_settings.rewind_granularity--; - } - else if (input == XUI_CONTROL_NAVIGATE_RIGHT || - input == XUI_CONTROL_NAVIGATE_OK) - g_settings.rewind_granularity++; - menu_settings_create_menu_item_label_w(strw_buffer, S_LBL_REWIND_GRANULARITY, sizeof(strw_buffer)); - XuiListSetText(m_menulist, INGAME_MENU_REWIND_GRANULARITY, strw_buffer); - break; case INGAME_MENU_FRAME_ADVANCE: g_extern.lifecycle_state |= (1ULL << RARCH_FRAMEADVANCE); settings_set(1ULL << S_FRAME_ADVANCE);