From 4373f0c45248c078068174e0cc78ca93d0bb80fa Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 30 Jan 2017 17:52:37 +0000
Subject: [PATCH] [ui] fix notification sound when closing using X

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

diff --git a/src/rufus.c b/src/rufus.c
index c39e8bf6..bce234b0 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -2722,13 +2722,16 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 	case WM_CLIENTSHUTDOWN:
 	case WM_QUERYENDSESSION:
 	case WM_ENDSESSION:
-		// TODO: Do we want to use ShutdownBlockReasonCreate() in Vista and later to stop
-		// forced shutdown? See https://msdn.microsoft.com/en-us/library/ms700677.aspx
 		if (format_op_in_progress) {
-			// WM_QUERYENDSESSION uses this value to prevent shutdown
 			return (INT_PTR)TRUE;
 		}
-		SendMessage(hDlg, WM_COMMAND, (WPARAM)IDCANCEL, (LPARAM)0);
+		if (message == WM_CLOSE) {
+			// We must use PostQuitMessage() on VM_CLOSE, to prevent notification sound...
+			PostQuitMessage(0);
+		} else {
+			// ...but we must simulate Cancel on shutdown requests, else the app freezes.
+			SendMessage(hDlg, WM_COMMAND, (WPARAM)IDCANCEL, (LPARAM)0);
+		}
 		break;
 
 	case UM_PROGRESS_INIT:
diff --git a/src/rufus.rc b/src/rufus.rc
index 4bae3aee..aa88cf02 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.12.1056"
+CAPTION "Rufus 2.12.1057"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -334,8 +334,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,12,1056,0
- PRODUCTVERSION 2,12,1056,0
+ FILEVERSION 2,12,1057,0
+ PRODUCTVERSION 2,12,1057,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -352,13 +352,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.12.1056"
+            VALUE "FileVersion", "2.12.1057"
             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.12.1056"
+            VALUE "ProductVersion", "2.12.1057"
         END
     END
     BLOCK "VarFileInfo"