diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-12-06 11:23:29 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-12-06 11:23:29 +0000 |
| commit | 123e0df8cacb3caece0eef2735d929e42873d412 (patch) | |
| tree | 5e7fd8f2abaf7d92afc208984c117dece19660d0 /plugins/FingerprintNG | |
| parent | 9b47317d044f871d72a22406e4fd92656e55d96e (diff) | |
another fix for finger's logic
git-svn-id: http://svn.miranda-ng.org/main/trunk@2665 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/FingerprintNG')
| -rw-r--r-- | plugins/FingerprintNG/src/fingerprint.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index 01d5cefa53..17f2686312 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -413,7 +413,7 @@ BOOL __inline WildCompareProcW(LPWSTR wszName, LPWSTR wszMask) static void MatchMasks(TCHAR* szMirVer, short *base, short *overlay,short *overlay2,short *overlay3)
{
- short i = 0, j = -1, k = -1, n = -1;
+ int i = 0, j = -1, k = -1, n = -1;
for (i=0; i < DEFAULT_KN_FP_MASK_COUNT; i++) {
KN_FP_MASK& p = def_kn_fp_mask[i];
@@ -423,17 +423,17 @@ static void MatchMasks(TCHAR* szMirVer, short *base, short *overlay,short *overl if ( !WildCompareW(szMirVer, p.szMaskUpper))
continue;
- if (p.iIconIndex != IDI_NOTFOUND || p.iIconIndex != IDI_UNKNOWN || p.iIconIndex != IDI_UNDETECTED) {
+ if (p.iIconIndex != IDI_NOTFOUND && p.iIconIndex != IDI_UNKNOWN && p.iIconIndex != IDI_UNDETECTED) {
TCHAR destfile[MAX_PATH];
mir_sntprintf(destfile, SIZEOF(destfile), _T("%s"), g_szSkinLib);
- struct _stat64i32 stFileInfo;
- if (_tstat(destfile, &stFileInfo) == -1)
+ struct _stat64i32 stFileInfo;
+ if ( _tstat(destfile, &stFileInfo) == -1)
i = NOTFOUND_MASK_NUMBER;
}
break;
}
- if (i == DEFAULT_KN_FP_MASK_COUNT)
+ if (i == DEFAULT_KN_FP_MASK_COUNT-1)
i = -1;
if (!def_kn_fp_mask[i].fNotUseOverlay && i < DEFAULT_KN_FP_MASK_COUNT) {
|