From ed4a81e497ede4897881afa50a04700b3164cf08 Mon Sep 17 00:00:00 2001
From: TwinAphex51224 <twinaphex1@gmail.com>
Date: Mon, 12 Mar 2012 03:53:44 +0100
Subject: [PATCH] (360) More of aforementioned

---
 360/menu.cpp | 2 +-
 dynamic.c    | 2 +-
 general.h    | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/360/menu.cpp b/360/menu.cpp
index b6e47f3510..54e44e3fa0 100644
--- a/360/menu.cpp
+++ b/360/menu.cpp
@@ -315,7 +315,7 @@ HRESULT CSSNESFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
 		{
 			memset(strbuffer, 0, sizeof(strbuffer));
 			wcstombs(strbuffer, (const wchar_t *)m_romlist.GetText(index), sizeof(strbuffer));
-			if((strstr(strbuffer, ".zip") || strstr(strbuffer, ".ZIP")) && g_console.extract_zip_files_enable)
+			if((strstr(strbuffer, ".zip") || strstr(strbuffer, ".ZIP")) && !g_console.block_zip_extract)
 			{
 				char path_tmp[1024];
 				sprintf(path_tmp, "%s\\%s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(browser), strbuffer);
diff --git a/dynamic.c b/dynamic.c
index 626b134779..ffe465ef6d 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -388,7 +388,7 @@ static bool environment_cb(unsigned cmd, void *data)
 
 #ifdef SSNES_CONSOLE
       case SNES_ENVIRONMENT_SET_BATCH_LOAD:
-         g_console.block_zip_extract = *(const bool*)data;
+         g_console.block_zip_extract = *(uint32_t*)data;
          break;
 
       case SNES_ENVIRONMENT_SET_ROM_FORMATS:
diff --git a/general.h b/general.h
index 368d3d278d..8685f92f39 100644
--- a/general.h
+++ b/general.h
@@ -189,8 +189,6 @@ struct console_settings
    bool block_config_read;
    bool default_sram_dir_enable;
    bool default_savestate_dir_enable;
-   bool extract_zip_files_enable;
-   bool block_zip_extract;
    bool frame_advance_enable;
    bool gamma_correction_enable;
    bool initialize_ssnes_enable;
@@ -202,6 +200,7 @@ struct console_settings
    bool throttle_enable;
    bool triple_buffering_enable;
    float overscan_amount;
+   uint32_t block_zip_extract;
    uint32_t aspect_ratio_index;
    uint32_t custom_viewport_width;
    uint32_t custom_viewport_height;