From 5c2d7aa21e11845257b17527b34f775a87caa743 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Thu, 13 Mar 2014 22:13:46 +0000
Subject: [PATCH] [syslinux] fix vesamenu.c32 errors

* Closes #298
---
 src/rufus.c  |  8 +++++---
 src/rufus.rc | 12 ++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/rufus.c b/src/rufus.c
index 72c4ae33..25baf802 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -1340,6 +1340,7 @@ static BOOL BootCheck(void)
 	int i, fs, bt, dt, r;
 	FILE* fd;
 	DWORD len;
+	BOOL in_files_dir = FALSE;
 	const char* ldlinux = "ldlinux";
 	const char* syslinux = "syslinux";
 	const char* ldlinux_ext[3] = { "sys", "bss", "c32" };
@@ -1403,15 +1404,16 @@ static BOOL BootCheck(void)
 				IGNORE_RETVAL(_chdirU(app_dir));
 				for (i=0; i<NB_OLD_C32; i++) {
 					if (iso_report.has_old_c32[i]) {
-						if (i==0) {
+						if (!in_files_dir) {
 							IGNORE_RETVAL(_mkdir(FILES_DIR));
 							IGNORE_RETVAL(_chdir(FILES_DIR));
+							in_files_dir = TRUE;
 						}
 						static_sprintf(tmp, "%s-%s/%s", syslinux, embedded_sl_version_str[0], old_c32_name[i]);
 						fd = fopen(tmp, "rb");
 						if (fd != NULL) {
 							// If a file already exists in the current directory, use that one
-							uprintf("Will replace obsolete '%s' from ISO with the one found in './%s'\n", old_c32_name[i], tmp);
+							uprintf("Will replace obsolete '%s' from ISO with the one found in './" FILES_DIR "/%s'\n", old_c32_name[i], tmp);
 							fclose(fd);
 							use_own_c32[i] = TRUE;
 						} else {
@@ -1449,7 +1451,7 @@ static BOOL BootCheck(void)
 					}
 				}
 				if ((syslinux_ldlinux_len[0] != 0) && (syslinux_ldlinux_len[1] != 0)) {
-					uprintf("Will reuse '%s.%s' and '%s.%s' from './%s/%s-%s/' for Syslinux installation\n",
+					uprintf("Will reuse '%s.%s' and '%s.%s' from './" FILES_DIR "/%s/%s-%s/' for Syslinux installation\n",
 						ldlinux, ldlinux_ext[0], ldlinux, ldlinux_ext[1], FILES_DIR, syslinux, iso_report.sl_version_str);
 				} else {
 					r = MessageBoxU(hMainDialog, lmprintf(MSG_114, iso_report.sl_version_str, embedded_sl_version_str[1]),
diff --git a/src/rufus.rc b/src/rufus.rc
index 2edafb4a..8d65003f 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDD_DIALOG DIALOGEX 12, 12, 206, 329
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 1.4.6.434"
+CAPTION "Rufus 1.4.6.435"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,94,291,50,14
@@ -165,7 +165,7 @@ END
 RTL_IDD_DIALOG DIALOGEX 12, 12, 206, 329
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
-CAPTION "Rufus 1.4.6.434"
+CAPTION "Rufus 1.4.6.435"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,94,291,50,14
@@ -427,8 +427,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,6,434
- PRODUCTVERSION 1,4,6,434
+ FILEVERSION 1,4,6,435
+ PRODUCTVERSION 1,4,6,435
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -445,13 +445,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "1.4.6.434"
+            VALUE "FileVersion", "1.4.6.435"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "1.4.6.434"
+            VALUE "ProductVersion", "1.4.6.435"
         END
     END
     BLOCK "VarFileInfo"