From b6a52756cd721103b9523007f74e5a6c8bbac582 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Fri, 31 Oct 2014 19:03:51 +0000
Subject: [PATCH] [misc] fix the display of "task x/y" when formatting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Using the famous URS™ (Under Rug Swept) technology
* Closes #182
---
 src/format.c |  8 +++++---
 src/rufus.rc | 12 ++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/format.c b/src/format.c
index 1ffc5777..c17e046a 100644
--- a/src/format.c
+++ b/src/format.c
@@ -108,9 +108,11 @@ static BOOLEAN __stdcall FormatExCallback(FILE_SYSTEM_CALLBACK_COMMAND Command,
 		UpdateProgress(OP_FORMAT, 1.0f * (*percent));
 		break;
 	case FCC_STRUCTURE_PROGRESS:	// No progress on quick format
-		PrintStatus(0, TRUE, MSG_218, ++task_number, nb_steps[fs_index]);
-		format_percent += 100.0f / (1.0f * nb_steps[fs_index]);
-		UpdateProgress(OP_CREATE_FS, format_percent);
+		if (task_number < nb_steps[fs_index] - 1) {
+			PrintStatus(0, TRUE, MSG_218, ++task_number, nb_steps[fs_index]);
+			format_percent += 100.0f / (1.0f * nb_steps[fs_index]);
+			UpdateProgress(OP_CREATE_FS, format_percent);
+		}
 		break;
 	case FCC_DONE:
 		PrintStatus(0, TRUE, MSG_218, nb_steps[fs_index], nb_steps[fs_index]);
diff --git a/src/rufus.rc b/src/rufus.rc
index 44466031..4f9b5304 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_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 1.4.11.522"
+CAPTION "Rufus 1.4.11.523"
 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_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
-CAPTION "Rufus 1.4.11.522"
+CAPTION "Rufus 1.4.11.523"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,94,291,50,14
@@ -428,8 +428,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,11,522
- PRODUCTVERSION 1,4,11,522
+ FILEVERSION 1,4,11,523
+ PRODUCTVERSION 1,4,11,523
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -446,13 +446,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "1.4.11.522"
+            VALUE "FileVersion", "1.4.11.523"
             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.11.522"
+            VALUE "ProductVersion", "1.4.11.523"
         END
     END
     BLOCK "VarFileInfo"