From 2ad0b2b50e544fa7a7b54184860b0fb90f4aa8b8 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Fri, 24 Feb 2006 06:19:40 +0000 Subject: [PATCH] restore the old canvas after showing a menu, avoiding potential problems --- ChangeLog | 3 +++ main/newmenu.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 24cb7066..da8fddb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ * main/gauges.c: make sure the correct font is used (whoops) + * main/newmenu.c: restore the old canvas after showing a menu, + avoiding potential problems + 2005-11-29 Chris Taylor * main/titles.c: for Descent 1 briefings, look for briefings no diff --git a/main/newmenu.c b/main/newmenu.c index 6c65f4f3..6b59ebb7 100644 --- a/main/newmenu.c +++ b/main/newmenu.c @@ -1,4 +1,4 @@ -/* $Id: newmenu.c,v 1.32 2005-08-02 06:13:56 chris Exp $ */ +/* $Id: newmenu.c,v 1.33 2006-02-24 06:19:20 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -1805,6 +1805,7 @@ int newmenu_do4( char * title, char * subtitle, int nitems, newmenu_item * item, gr_free_sub_canvas( bg.menu_canvas ); + gr_set_current_canvas(save_canvas); grd_curcanv->cv_font = save_font; keyd_repeat = old_keyd_repeat; -- 2.39.2