From: <mar...@us...> - 2009-12-15 14:05:08
|
Revision: 2874 http://navit.svn.sourceforge.net/navit/?rev=2874&view=rev Author: martin-s Date: 2009-12-15 14:04:58 +0000 (Tue, 15 Dec 2009) Log Message: ----------- Fix:Ignore multiple menu calls Modified Paths: -------------- trunk/navit/navit/gui/internal/gui_internal.c Modified: trunk/navit/navit/gui/internal/gui_internal.c =================================================================== --- trunk/navit/navit/gui/internal/gui_internal.c 2009-12-15 12:14:23 UTC (rev 2873) +++ trunk/navit/navit/gui/internal/gui_internal.c 2009-12-15 14:04:58 UTC (rev 2874) @@ -4011,6 +4011,8 @@ static void gui_internal_cmd_menu2(struct gui_priv *this) { + if (this->root.children) + return; gui_internal_cmd_menu(this, NULL, 0); } @@ -4274,9 +4276,13 @@ } dbg(1,"w=%d h=%d children=%p\n", w, h, this->root.children); navit_handle_resize(this->nav, w, h); - if (this->root.children && changed) { - gui_internal_prune_menu(this, NULL); - gui_internal_menu_root(this); + if (this->root.children) { + if (changed) { + gui_internal_prune_menu(this, NULL); + gui_internal_menu_root(this); + } else { + gui_internal_menu_render(this); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |