Make sure a cursor is always returned if one exists.

ad3a5ed5 · Mike McCormack · Alexandre Julliard · a5156dcf · ad3a5ed5
Commit ad3a5ed5 authored Aug 19, 2005 by Mike McCormack Committed by Alexandre Julliard Aug 19, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cursoricon.c dlls/user/cursoricon.c +2 -2

No files found.
--- a/dlls/user/cursoricon.c
+++ b/dlls/user/cursoricon.c
@@ -583,8 +583,8 @@ static int CURSORICON_FindBestCursor( LPVOID dir, fnGetCIEntry get_entry,
    maxwidth = maxheight = 255;
    for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ )
    {
-        if ((cx < maxwidth) && (cy < maxheight) &&
+        if (((cx < maxwidth) && (cy < maxheight) && (bits == 1)) ||
-            (bits == 1))
+            (bestEntry==-1))
        {
            bestEntry = i;
            maxwidth  = cx;