mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-24 19:54:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

[wue] fix Windows User Experience dialog appearing twice with Windows To Go

Browse source 
* Issue was introduced with the fix for #1956
* Closes #1968
* Also set rufus-next to 3.20
This commit is contained in:
Pete Batard 2022-07-05 14:08:26 +01:00
parent 8fb602b8ee
commit 110f4025b7
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
4 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/rufus.c
View file

@ -1526,6 +1526,7 @@ static DWORD WINAPI BootCheckThread(LPVOID param)
DWORD len;
WPARAM ret = BOOTCHECK_CANCEL;
BOOL in_files_dir = FALSE, esp_already_asked = FALSE;
BOOL is_windows_to_go = ((image_options & IMOP_WINTOGO) && (ComboBox_GetCurItemData(hImageOption) == IMOP_WIN_TO_GO));
const char* grub = "grub";
const char* core_img = "core.img";
const char* ldlinux = "ldlinux";
@ -1590,7 +1591,7 @@ static DWORD WINAPI BootCheckThread(LPVOID param)
goto out;
}
if ((image_options & IMOP_WINTOGO) && (ComboBox_GetCurItemData(hImageOption) == IMOP_WIN_TO_GO)) {
if (is_windows_to_go) {
if (fs_type != FS_NTFS) {
// Windows To Go only works for NTFS
MessageBoxExU(hMainDialog, lmprintf(MSG_097, "Windows To Go"), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid);
@ -1670,7 +1671,7 @@ static DWORD WINAPI BootCheckThread(LPVOID param)
MessageBoxExU(hMainDialog, lmprintf(MSG_100), lmprintf(MSG_099), MB_OK | MB_ICONERROR | MB_IS_RTL, selected_langid);
goto out;
}
if ((nWindowsVersion >= WINDOWS_8) && IS_WINDOWS_11(img_report)) {
if ((nWindowsVersion >= WINDOWS_8) && IS_WINDOWS_11(img_report) && (!is_windows_to_go)) {
StrArray options;
int arch = _log2(img_report.has_efi >> 1);
uint8_t map[8] = { 0 }, b = 1;