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

	is called as there is explicit capture_end.

diff --git a/ChangeLog b/ChangeLog
index 484faa053916038a8d2800d19843ae7c4c7eba8c..c83c74624c2f19b538cebd060e3133ed2978b027 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * 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 18ffa28e36a0e01653221b11e86719d03562b7eb..bae6401ab214e49fa11755701ca373209de3f2e0 100644 (file)
--- 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,