"docs/vscode:/vscode.git/clone" did not exist on "eb7d9261c0bf40ca0153cba28f3f78d971207d8e"
Unverified Commit 2d76fa73 authored by A1ive's avatar A1ive Committed by GitHub
Browse files

fix bugs (#1561)

* fix bug stopping iteration when --no-floppy is used

* fix gfxmenu theme config handling bug
parent 8fc8cc68
...@@ -68,7 +68,7 @@ iterate_device (const char *name, void *data) ...@@ -68,7 +68,7 @@ iterate_device (const char *name, void *data)
/* Skip floppy drives when requested. */ /* Skip floppy drives when requested. */
if (ctx->no_floppy && if (ctx->no_floppy &&
name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9') name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9')
return 1; return 0;
if (g_no_vtoyefi_part && (grub_strcmp(name, g_vtoyefi_dosname) == 0 || grub_strcmp(name, g_vtoyefi_gptname) == 0)) { if (g_no_vtoyefi_part && (grub_strcmp(name, g_vtoyefi_dosname) == 0 || grub_strcmp(name, g_vtoyefi_gptname) == 0)) {
return 0; return 0;
......
...@@ -456,7 +456,8 @@ read_expression (struct parsebuf *p) ...@@ -456,7 +456,8 @@ read_expression (struct parsebuf *p)
/* Read as a single word -- for numeric values or words without /* Read as a single word -- for numeric values or words without
whitespace. */ whitespace. */
start = p->pos; start = p->pos;
while (has_more (p) && ! is_whitespace (peek_char (p))) while (has_more (p) && ! is_whitespace (peek_char (p))
&& peek_char (p) != '}')
read_char (p); read_char (p);
end = p->pos; end = p->pos;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment