# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1049280908 0
# Node ID 89eac0990c67eebd8cfe4abde1497f78ba9ecfae
# Parent  41b890c649e7349f0321d6d0b221b3bae804b1b8
Safer container code.

diff -r 41b890c649e7 -r 89eac0990c67 os2/dw.c
--- a/os2/dw.c	Mon Mar 31 21:32:55 2003 +0000
+++ b/os2/dw.c	Wed Apr 02 10:55:08 2003 +0000
@@ -1840,7 +1840,7 @@
 
 void _clear_emphasis(void)
 {
-	if(hwndEmph && pCoreEmph)
+	if(hwndEmph && WinIsWindow(dwhab, hwndEmph) && pCoreEmph)
 		WinSendMsg(hwndEmph, CM_SETRECORDEMPHASIS, pCoreEmph, MPFROM2SHORT(FALSE, CRA_SOURCE));
 	hwndEmph = NULLHANDLE;
 	pCoreEmph = NULL;
@@ -6271,6 +6271,8 @@
 {
 	int z = 0;
 
+	if(hwndEmph == handle)
+		_clear_emphasis();
 	if(!dw_window_get_data(handle, "_dw_container"))
 	{
 		PCNRITEM pCore = WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)0L, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));