浏览代码

rtgui/widgets/window.c: check null reference on rtgui_container.focused

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1829 bbd45198-f89e-11dd-88c7-29a3b14d5316
chaos.proton@gmail.com 13 年之前
父节点
当前提交
57e2947cfc
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      components/rtgui/widgets/window.c

+ 2 - 1
components/rtgui/widgets/window.c

@@ -518,7 +518,8 @@ rt_bool_t rtgui_win_event_handler(struct rtgui_widget* widget, struct rtgui_even
 			if (win->modal_widget != RT_NULL)
 			if (win->modal_widget != RT_NULL)
 				return win->modal_widget->event_handler(win->modal_widget, event);
 				return win->modal_widget->event_handler(win->modal_widget, event);
 		}
 		}
-		else if (RTGUI_CONTAINER(win)->focused != widget)
+		else if (RTGUI_CONTAINER(win)->focused != widget &&
+				 RTGUI_CONTAINER(win)->focused != RT_NULL)
 		{
 		{
 			RTGUI_CONTAINER(win)->focused->event_handler(RTGUI_CONTAINER(win)->focused, event);
 			RTGUI_CONTAINER(win)->focused->event_handler(RTGUI_CONTAINER(win)->focused, event);
 		}
 		}