From 8889af2d199f8d90fd4a0e8e3eceb7cb9f17f474 Mon Sep 17 00:00:00 2001 From: TwinAphex51224 Date: Mon, 28 May 2012 15:43:56 +0200 Subject: [PATCH] (360) Starts up with default generated config file again --- 360/main.c | 3 ++- 360/menu.cpp | 7 ++++++- 360/xdk360_video.cpp | 7 ++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/360/main.c b/360/main.c index c010ed7ad3..0b1d1680f8 100644 --- a/360/main.c +++ b/360/main.c @@ -134,6 +134,7 @@ static void set_default_settings (void) strlcpy(g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE, sizeof(g_settings.video.cg_shader_path)); g_settings.video.fbo_scale_x = 2.0f; g_settings.video.fbo_scale_y = 2.0f; + strlcpy(g_settings.video.second_pass_shader, DEFAULT_SHADER_FILE, sizeof(g_settings.video.second_pass_shader)); g_settings.video.second_pass_smooth = true; g_settings.video.smooth = true; g_settings.video.vsync = true; @@ -190,7 +191,7 @@ static void init_settings (bool load_libretro_path) if(!path_file_exists(SYS_CONFIG_FILE)) { FILE * f; - RARCH_ERR("Config file \"%s\" desn't exist. Creating...\n", "game:\\retroarch.cfg"); + RARCH_ERR("Config file \"%s\" doesn't exist. Creating...\n", SYS_CONFIG_FILE); f = fopen(SYS_CONFIG_FILE, "w"); fclose(f); } diff --git a/360/menu.cpp b/360/menu.cpp index 2d511664f7..835c9742a7 100644 --- a/360/menu.cpp +++ b/360/menu.cpp @@ -797,7 +797,12 @@ void menu_loop(void) do { - rarch_render_cached_frame(); + if(!g_console.emulator_initialized) + d3d9->d3d_render_device->Clear(0, NULL, D3DCLEAR_TARGET, D3DCOLOR_ARGB(0, 0, 0, 0), 1.0f, 0); + else + { + rarch_render_cached_frame(); + } XINPUT_STATE state; XInputGetState(0, &state); diff --git a/360/xdk360_video.cpp b/360/xdk360_video.cpp index 65bd8ed5a8..3ee3b8e7fd 100644 --- a/360/xdk360_video.cpp +++ b/360/xdk360_video.cpp @@ -689,11 +689,8 @@ static void xdk360_set_nonblock_state(void *data, bool state) { xdk360_video_t *d3d9 = (xdk360_video_t*)data; - if(d3d9->vsync) - { - RARCH_LOG("D3D Vsync => %s\n", state ? "off" : "on"); - gfx_ctx_set_swap_interval(state ? 0 : 1, TRUE); - } + RARCH_LOG("D3D Vsync => %s\n", state ? "off" : "on"); + gfx_ctx_set_swap_interval(state ? 0 : 1, TRUE); } static bool xdk360_alive(void *data)