From 08767009497d5e02bf1ff539f30b11340c4642f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Belleng=C3=A9?= Date: Mon, 22 Aug 2005 09:17:25 +0000 Subject: [PATCH] Make the icon choice algorithm really choose the best icon. --- programs/winemenubuilder/winemenubuilder.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 4a8cf89d196..b883a431854 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -279,20 +279,16 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, const char *szXPMFile { 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; - nMax = 0; - } - } + if ((pIconDir->idEntries[i].wBitCount >= nMaxBits) && (pIconDir->idEntries[i].wBitCount <= 8)) + { + 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; - } + 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; + } + } } }