Damjan Jovanovic : winemenubuilder: Improve icon generation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 83b081f73c6d0bfda680ffa32fe77c7523ea43dc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=83b081f73c6d0bfda680ffa32f...

Author: Damjan Jovanovic 
Date:   Sat Dec 27 14:37:48 2008 +0200

winemenubuilder: Improve icon generation.

---

programs/winemenubuilder/winemenubuilder.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index ec7a162..56eac5a 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -494,14 +494,13 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName)
             {
                 for (i = 0; i < pIconDir->idCount; i++)
                 {
-		    if ((pIconDir->idEntries[i].wBitCount >= nMaxBits) && (pIconDir->idEntries[i].wBitCount <= 8))
+		    if (pIconDir->idEntries[i].wBitCount >= nMaxBits)
    	    {
-			nMaxBits = pIconDir->idEntries[i].wBitCount;
-
    		if ((pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth) >= nMax)
    		{
    		    lpName = MAKEINTRESOURCEW(pIconDir->idEntries[i].nID);
    		    nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth;
+			    nMaxBits = pIconDir->idEntries[i].wBitCount;
    		}
    	    }		    
                 }