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

* grub-core/video/capture.c: Do not do finalization when .fini

Browse source 
is called as there is explicit capture_end.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-03 23:33:58 +02:00
parent 4fa60739f2
commit e44b9a8349
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-10-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/video/capture.c: Do not do finalization when .fini
is called as there is explicit capture_end.
2013-10-03 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/gfxterm.c: Add flag "functional" to skip input when * grub-core/term/gfxterm.c: Add flag "functional" to skip input when

8
grub-core/video/capture.c
View file

@ -31,6 +31,12 @@ grub_video_capture_set_active_render_target (struct grub_video_render_target *ta
return grub_video_fb_set_active_render_target (target); return grub_video_fb_set_active_render_target (target);
} }
static grub_err_t
grub_video_capture_fini (void)
{
return GRUB_ERR_NONE;
}
static struct grub_video_adapter grub_video_capture_adapter = static struct grub_video_adapter grub_video_capture_adapter =
{ {
.name = "Render capture", .name = "Render capture",
@ -38,7 +44,7 @@ static struct grub_video_adapter grub_video_capture_adapter =
.prio = 0, .prio = 0,
.id = GRUB_VIDEO_ADAPTER_CAPTURE, .id = GRUB_VIDEO_ADAPTER_CAPTURE,
.fini = grub_video_fb_fini, .fini = grub_video_capture_fini,
.get_info = grub_video_fb_get_info, .get_info = grub_video_fb_get_info,
.get_info_and_fini = 0, .get_info_and_fini = 0,
.set_palette = grub_video_fb_set_palette, .set_palette = grub_video_fb_set_palette,