Merge pull request #10 from endlessm/T16731archive/v0.9-endlessRelease_3.5.9Release_3.5.8Release_3.5.7Release_3.5.6Release_3.5.5Release_3.5.4Release_3.5.3Release_3.5.2Release_3.5.1Release_3.5.0Release_3.4.8Release_3.4.7Release_3.4.6Release_3.4.5Release_3.4.4Release_3.4.3Release_3.4.2Release_3.4.1Release_3.4.0Release_3.3.9Release_3.3.8Release_3.3.7Release_3.3.6Release_3.3.5Release_3.3.4Release_3.3.3Release_3.3.2Release_3.3.18Release_3.3.17Release_3.3.16Release_3.3.15Release_3.3.14Release_3.3.13Release_3.3.12Release_3.3.11Release_3.3.10Release_3.3.1Release_3.3.0Release_3.2.6Release_3.2.5Release_3.2.4Release_3.2.3Release_3.2.2Release_3.2.1Release_3.2.0Release_3.1.8Release_3.1.7Release_3.1.6

fallback: Avoid duplicates in BootOrder

1 files changed, 4 insertions, 2 deletions

diff --git a/fallback.c b/fallback.c
index 174fd8cb..1780dae9 100644
--- a/fallback.c
+++ b/fallback.c
@@ -204,14 +204,16 @@ do_add_boot_option(int boot_entry_num, EFI_DEVICE_PATH *hddp,
 		return EFI_OUT_OF_RESOURCES;
 
 	int j = 0;
+	int n = 1;
 	newbootorder[0] = boot_entry_num & 0xffff;
 	if (nbootorder) {
 		for (j = 0; j < nbootorder; j++)
-			newbootorder[j+1] = bootorder[j];
+			if (bootorder[j] != boot_entry_num)
+				newbootorder[n++] = bootorder[j];
 		FreePool(bootorder);
 	}
 	bootorder = newbootorder;
-	nbootorder += 1;
+	nbootorder = n;
 #ifdef DEBUG_FALLBACK
 	Print(L"nbootorder: %d\nBootOrder: ", nbootorder);
 	for (j = 0 ; j < nbootorder ; j++)