From 77636d948e735d1b34b5630209a58afa5deb60cb Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Sat, 5 Dec 2015 15:40:35 +0000
Subject: [PATCH] [core] disable FAT32 option for Windows ISOs in BIOS/CSM mode

* This was inadvertently enabled in Rufus 2.4 (commit 49e5490) and
  is causing all kind of issues, such as #641.
---
 src/rufus.c  |  3 ++-
 src/rufus.rc | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/rufus.c b/src/rufus.c
index 3d0a5ec0..2e8cdbf4 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -1334,7 +1334,8 @@ static BOOL BootCheck(void)
 			}
 		} else if ( ((fs == FS_NTFS) && (!img_report.has_bootmgr) && (!IS_WINPE(img_report.winpe)) && (!IS_GRUB(img_report)))
 				 || ((IS_FAT(fs)) && (!HAS_SYSLINUX(img_report)) && (!allow_dual_uefi_bios) && (!img_report.has_efi) &&
-					 (!IS_REACTOS(img_report)) && (!img_report.has_kolibrios) && (!IS_GRUB(img_report))) ) {
+					 (!IS_REACTOS(img_report)) && (!img_report.has_kolibrios) && (!IS_GRUB(img_report)))
+				 || ((IS_FAT(fs)) && (IS_WINPE(img_report.winpe) || HAS_INSTALL_WIM(img_report))) ) {
 			// Incompatible FS and ISO
 			MessageBoxExU(hMainDialog, lmprintf(MSG_096), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid);
 			return FALSE;
diff --git a/src/rufus.rc b/src/rufus.rc
index a92dbbd0..e4ed6411 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 2.6.810"
+CAPTION "Rufus 2.6.811"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -319,8 +319,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,810,0
- PRODUCTVERSION 2,6,810,0
+ FILEVERSION 2,6,811,0
+ PRODUCTVERSION 2,6,811,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -337,13 +337,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.6.810"
+            VALUE "FileVersion", "2.6.811"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.6.810"
+            VALUE "ProductVersion", "2.6.811"
         END
     END
     BLOCK "VarFileInfo"