vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

More video checks.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-05-04 14:00:14 +02:00
parent 92323d1fb0
commit b7c036bce3
8 changed files with 510 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

6
grub-core/video/video.c
View file

@ -499,6 +499,9 @@ grub_video_set_mode (const char *modestring,
char *current_mode;
char *modevar;
if (grub_video_adapter_active && grub_video_adapter_active->id == GRUB_VIDEO_ADAPTER_CAPTURE)
return GRUB_ERR_NONE;
modevalue &= modemask;
/* Take copy of env.var. as we don't want to modify that. */
@ -510,9 +513,6 @@ grub_video_set_mode (const char *modestring,
if (! modevar)
return grub_errno;
if (grub_video_adapter_active && grub_video_adapter_active->id == GRUB_VIDEO_ADAPTER_CAPTURE)
return GRUB_ERR_NONE;
if (grub_memcmp (next_mode, "keep", sizeof ("keep")) == 0
|| grub_memcmp (next_mode, "keep,", sizeof ("keep,") - 1) == 0
|| grub_memcmp (next_mode, "keep;", sizeof ("keep;") - 1) == 0)