[core] fix abort if we can't display the "drive in use" message

* Also display the current MUI on startup and set version to rufus-next
This commit is contained in:
Pete Batard 2018-12-14 18:19:33 +00:00
parent 52dd78ea34
commit f94d2f479f
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
7 changed files with 24 additions and 21 deletions

View file

@ -1557,7 +1557,7 @@ static void InitDialog(HWND hDlg)
uprintf("Syslinux versions: %s%s, %s%s", embedded_sl_version_str[0], embedded_sl_version_ext[0],
embedded_sl_version_str[1], embedded_sl_version_ext[1]);
uprintf("Grub versions: %s, %s", GRUB4DOS_VERSION, GRUB2_PACKAGE_VERSION);
uprintf("System locale ID: 0x%04X", GetUserDefaultUILanguage());
uprintf("System locale ID: 0x%04X (%s)", GetUserDefaultUILanguage(), GetCurrentMUI());
ubflush();
if (selected_locale->ctrl_id & LOC_NEEDS_UPDATE) {
uprintf("NOTE: The %s translation requires an update, but the current translator hasn't submitted "
@ -1841,6 +1841,9 @@ static BOOL CheckDriveAccess(DWORD dwTimeOut)
ComboBox_GetTextU(hDeviceList, title, sizeof(title));
proceed = Notification(MSG_WARNING_QUESTION, NULL, NULL, title, message);
free(message);
} else {
proceed = Notification(MSG_WARNING_QUESTION, NULL, NULL, title,
"This drive is in use. Do you want to format it anyway?");
}
}
ret = proceed;