From e44b9a83490ffc3e1bee7eb5f7522940aaab5778 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Thu, 3 Oct 2013 23:33:58 +0200 Subject: [PATCH] * grub-core/video/capture.c: Do not do finalization when .fini is called as there is explicit capture_end. --- ChangeLog | 5 +++++ grub-core/video/capture.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 484faa053..c83c74624 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-03 Vladimir Serbinenko + + * grub-core/video/capture.c: Do not do finalization when .fini + is called as there is explicit capture_end. + 2013-10-03 Vladimir Serbinenko * grub-core/term/gfxterm.c: Add flag "functional" to skip input when diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c index 18ffa28e3..bae6401ab 100644 --- a/grub-core/video/capture.c +++ b/grub-core/video/capture.c @@ -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); } +static grub_err_t +grub_video_capture_fini (void) +{ + return GRUB_ERR_NONE; +} + static struct grub_video_adapter grub_video_capture_adapter = { .name = "Render capture", @@ -38,7 +44,7 @@ static struct grub_video_adapter grub_video_capture_adapter = .prio = 0, .id = GRUB_VIDEO_ADAPTER_CAPTURE, - .fini = grub_video_fb_fini, + .fini = grub_video_capture_fini, .get_info = grub_video_fb_get_info, .get_info_and_fini = 0, .set_palette = grub_video_fb_set_palette,