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

* grub-core/gfxmenu/view.c (grub_gfxmenu_view_new): Clear

Browse source 
grub_gfxmenu_timeout_notifications.
	(grub_gfxmenu_view_destroy): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-05-03 14:02:49 +02:00
parent b5a2114d76
commit a4f9a5ff92
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-05-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/gfxmenu/view.c (grub_gfxmenu_view_new): Clear
grub_gfxmenu_timeout_notifications.
(grub_gfxmenu_view_destroy): Likewise.
2013-05-03 Vladimir Serbinenko <phcoder@gmail.com> 2013-05-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/term.c (print_ucs4_real): Fix startwidth in dry run. * grub-core/normal/term.c (print_ucs4_real): Fix startwidth in dry run.

15
grub-core/gfxmenu/view.c
View file

@ -58,6 +58,14 @@ grub_gfxmenu_view_new (const char *theme_path,
if (! view) if (! view)
return 0; return 0;
while (grub_gfxmenu_timeout_notifications)
{
struct grub_gfxmenu_timeout_notify *p;
p = grub_gfxmenu_timeout_notifications;
grub_gfxmenu_timeout_notifications = grub_gfxmenu_timeout_notifications->next;
grub_free (p);
}
view->screen.x = 0; view->screen.x = 0;
view->screen.y = 0; view->screen.y = 0;
view->screen.width = width; view->screen.width = width;
@ -105,6 +113,13 @@ grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view)
{ {
if (!view) if (!view)
return; return;
while (grub_gfxmenu_timeout_notifications)
{
struct grub_gfxmenu_timeout_notify *p;
p = grub_gfxmenu_timeout_notifications;
grub_gfxmenu_timeout_notifications = grub_gfxmenu_timeout_notifications->next;
grub_free (p);
}
grub_video_bitmap_destroy (view->desktop_image); grub_video_bitmap_destroy (view->desktop_image);
if (view->terminal_box) if (view->terminal_box)
view->terminal_box->destroy (view->terminal_box); view->terminal_box->destroy (view->terminal_box);