commit f91e6d037e6cd5ff3b88056465c47fadaa38dab5
author Francis Beaudet <francis@macadamian.com> Thu Mar 25 13:22:42 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Mar 25 13:22:42 1999 +0000
tree 3d48fe76b4af092993c6ca87b21e7ae3a60f2a22
parent 8730e4572dad25a63e4c08178a750dcccc7cc815

Fixed possible endless loop.

windows/dialog.c

diff --git a/windows/dialog.c b/windows/dialog.c
index cfc1bb7..bd52d89 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -1045,11 +1045,12 @@
         do
         {
             wndPtr = WIN_FindWndPtr( hwndControl );
-            if (wndPtr != NULL && wndPtr->text != NULL && 
-                    (wndPtr->dwStyle & (WS_VISIBLE | WS_DISABLED)) == WS_VISIBLE)
+            if ( (wndPtr != NULL) && 
+                 ((wndPtr->dwStyle & (WS_VISIBLE | WS_DISABLED)) == WS_VISIBLE) )
             {
                 dlgCode = SendMessageA( hwndControl, WM_GETDLGCODE, 0, 0 );
-                if (dlgCode & (DLGC_BUTTON | DLGC_STATIC))
+                if ( (dlgCode & (DLGC_BUTTON | DLGC_STATIC)) && 
+                     (wndPtr->text!=NULL))
                 {
                     /* find the accelerator key */
                     LPSTR p = wndPtr->text - 2;