From 11633a318a00402e4f517ffee047ab79de0eb0e6 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Wed, 15 Apr 2020 16:50:36 +0100
Subject: [PATCH] [internal] update ChangeLog for BETA

* Also add an extra device to the list of internally unlisted
---
 ChangeLog.txt |  8 ++++++++
 src/dev.c     | 10 +++++++---
 src/rufus.rc  | 10 +++++-----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8f48b9d3..4d648c2d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,11 @@
+o Version 3.10 (2020.04.??)
+    Improve Ubuntu 20.04 support
+    Improve detection of FIXED drives with no mounted partitions
+    Update UEFI:NTFS file system drivers to v1.5
+    Fix progress not being updated for German UI
+    Fix an assert during FreeDOS drive creation when the system locale is UTF-8
+    Fix invalid label errors when using a non-Western locale
+
 o Version 3.9 (2020.02.29)
     Add exFAT support when creating blank UEFI:NTFS drives [EXPERIMENTAL]
     Fix ext2/ext3 corruption for partitions larger than 4 GB
diff --git a/src/dev.c b/src/dev.c
index 0e1183ae..599d76f1 100644
--- a/src/dev.c
+++ b/src/dev.c
@@ -781,9 +781,13 @@ BOOL GetDevices(DWORD devnum)
 				}
 				static_strcpy(str, "????:????");	// Couldn't figure VID:PID
 			} else {
-				// because I don't want to end up erasing this specific device of mine by accident
-				if (its_a_me_mario && (props.vid == 0x0525) && (props.pid == 0x622b))
-					continue;
+				// I *REALLY* don't want to erase the devices below by accident.
+				if (its_a_me_mario) {
+					if ((props.vid == 0x0525) && (props.pid == 0x622b))
+						continue;
+					if ((props.vid == 0x0781) && (props.pid == 0x75a0))
+						continue;
+				}
 				static_sprintf(str, "%04X:%04X", props.vid, props.pid);
 			}
 			if (props.speed >= USB_SPEED_MAX)
diff --git a/src/rufus.rc b/src/rufus.rc
index cc6d76cc..7ac708c3 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.10.1641"
+CAPTION "Rufus 3.10.1642"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,10,1641,0
- PRODUCTVERSION 3,10,1641,0
+ FILEVERSION 3,10,1642,0
+ PRODUCTVERSION 3,10,1642,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.10.1641"
+            VALUE "FileVersion", "3.10.1642"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.10.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.10.1641"
+            VALUE "ProductVersion", "3.10.1642"
         END
     END
     BLOCK "VarFileInfo"