[grub] update Grub4DOS to 0.4.6a

* Also fix Grub4DOS and Grub2.0 versioning issues
* Also ensures that operation gets canceled on missing download
* Also fix German translation and remove trailing whitespaces in .loc file
* Also fix inverted display status for VMWare disk detection
This commit is contained in:
Pete Batard 2015-02-16 22:29:23 +00:00
parent 24b435648e
commit 1dc55596d5
8 changed files with 88 additions and 87 deletions

View file

@ -46,6 +46,7 @@
#include "badblocks.h"
#include "localization.h"
#include "bled/bled.h"
#include "../res/grub/grub_version.h"
/*
* Globals
@ -1827,7 +1828,7 @@ DWORD WINAPI FormatThread(void* param)
grub4dos_dst[0] = drive_name[0];
uprintf("Installing: %s (Grub4DOS loader)\n", grub4dos_dst);
IGNORE_RETVAL(_chdirU(app_dir));
if (!CopyFileU(FILES_DIR "\\grub4dos\\grldr", grub4dos_dst, FALSE))
if (!CopyFileU(FILES_DIR "\\grub4dos-" GRUB4DOS_VERSION "\\grldr", grub4dos_dst, FALSE))
uprintf("Failed to copy file: %s", WindowsErrorString());
} else if ((dt == DT_ISO) && (image_path != NULL)) {
UpdateProgress(OP_DOS, 0.0f);