From 9c8cb59253f8de1fd3fc74ed5d10b4bee9e41996 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Tue, 7 Nov 2017 11:24:57 +0000
Subject: [PATCH] v2.18 (build 1213)

---
 ChangeLog.txt                 |  3 ++-
 res/appstore/AppxManifest.xml |  2 +-
 src/rufus.c                   |  2 +-
 src/rufus.rc                  | 10 +++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 73580a5b..32eed73c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,9 +1,10 @@
-o Version 2.18 (2017.11.??)
+o Version 2.18 (2017.11.07)
     Ensure that the same drive is reselected on device refresh
     Add a cheat mode to cycle the USB port of currently selected device
     Make lookup for updatable .cfg file more generic (e.g. ESET SysRescue)
     Fix handling of multiextent ISOs (e.g. BlackArch Linux)
     Fix propagation of image decompression errors
+    Update grub4dos to latest
 
     IMPORTANT: THIS IS THE LAST RELEASE TO SUPPORT WINDOWS XP AND WINDOWS VISTA
     FUTURE RUFUS RELEASES WILL *NO LONGER* BE COMPATIBLE WITH THESE PLATFORMS
diff --git a/res/appstore/AppxManifest.xml b/res/appstore/AppxManifest.xml
index a7ab7892..f8171429 100644
--- a/res/appstore/AppxManifest.xml
+++ b/res/appstore/AppxManifest.xml
@@ -8,7 +8,7 @@
        for an interesting struggle, when you also happen to have a comma in one of the fields... -->
   <Identity
    Name="Rufus"
-   Version="2.18.1198.0"
+   Version="2.18.1213.0"
    ProcessorArchitecture="x86"
    Publisher='CN=Akeo Consulting, O=Akeo Consulting, STREET="24, Grey Rock", L=Milford, S=Co Donegal, PostalCode=Co Donegal, C=IE' />
     <Properties>
diff --git a/src/rufus.c b/src/rufus.c
index 06242196..85471ff2 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -2284,7 +2284,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 	char tmp[128];
 	wchar_t* wbuffer = NULL;
 	loc_cmd* lcmd = NULL;
-	EXT_DECL(img_ext, NULL, __VA_GROUP__("*.img;*.vhd;*.gz;*.bzip2;*.xz;*.lzma;*.Z;*.zip"), __VA_GROUP__(lmprintf(MSG_095)));
+	EXT_DECL(img_ext, NULL, __VA_GROUP__("*.img;*.vhd;*.gz;*.bzip2;*.bz2;*.xz;*.lzma;*.Z;*.zip"), __VA_GROUP__(lmprintf(MSG_095)));
 	EXT_DECL(iso_ext, NULL, __VA_GROUP__("*.iso"), __VA_GROUP__(lmprintf(MSG_036)));
 	LPNMTOOLBAR lpnmtb;
 
diff --git a/src/rufus.rc b/src/rufus.rc
index a2c37ce1..5b4958ec 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,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
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.18.1212"
+CAPTION "Rufus 2.18.1213"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -366,8 +366,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,18,1212,0
- PRODUCTVERSION 2,18,1212,0
+ FILEVERSION 2,18,1213,0
+ PRODUCTVERSION 2,18,1213,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -384,13 +384,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.18.1212"
+            VALUE "FileVersion", "2.18.1213"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.18.1212"
+            VALUE "ProductVersion", "2.18.1213"
         END
     END
     BLOCK "VarFileInfo"