diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-07-29 20:52:15 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-07-29 20:52:15 +0000 |
| commit | 29070b3ffe5e8f62103121aa5a8a35b1aeca975f (patch) | |
| tree | 91458cccc0c4a8177cc36827d96e9f347b964bd6 | |
| parent | 4af0111e8fc0f61fa4af0d67d1dfa42b7c1e99d0 (diff) | |
correct dynamic options processing
git-svn-id: http://svn.miranda-ng.org/main/trunk@1252 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/FingerPrintModPlus/src/fingerprint.cpp | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/plugins/FingerPrintModPlus/src/fingerprint.cpp b/plugins/FingerPrintModPlus/src/fingerprint.cpp index 1a357a7d68..6bacee887f 100644 --- a/plugins/FingerPrintModPlus/src/fingerprint.cpp +++ b/plugins/FingerPrintModPlus/src/fingerprint.cpp @@ -44,13 +44,16 @@ static TCHAR* getSectionName(int flag) return NULL;
}
-void FASTCALL Prepare(KN_FP_MASK* mask)
+void FASTCALL Prepare(KN_FP_MASK* mask, bool bEnable)
{
- if (!mask->szMask || !mask->szIconFileName)
- return;
+ mask->szMaskUpper = NULL;
if (mask->hIcolibItem)
Skin_RemoveIcon(mask->szIconName);
+ mask->hIcolibItem = NULL;
+
+ if (!mask->szMask || !mask->szIconFileName || !bEnable)
+ return;
size_t iMaskLen = _tcslen(mask->szMask) + 1;
LPTSTR pszNewMask = (LPTSTR)HeapAlloc(hHeap, HEAP_NO_SERIALIZE, iMaskLen * sizeof(TCHAR));
@@ -99,26 +102,27 @@ void RegisterIcons() hHeap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0);
for (i=0; i < DEFAULT_KN_FP_MASK_COUNT; i++)
- Prepare(&def_kn_fp_mask[i]);
+ Prepare(&def_kn_fp_mask[i], true);
- if (DBGetContactSettingByte(NULL, "Finger", "Overlay1", 1))
- for (i=0; i < DEFAULT_KN_FP_OVERLAYS_COUNT; i++)
- Prepare( &def_kn_fp_overlays_mask[i] );
+ bool bEnable = DBGetContactSettingByte(NULL, "Finger", "Overlay1", 1) != 0;
+ for (i=0; i < DEFAULT_KN_FP_OVERLAYS_COUNT; i++)
+ Prepare(&def_kn_fp_overlays_mask[i], bEnable);
- if (DBGetContactSettingByte(NULL, "Finger", "Overlay2", 1)) {
- if (DBGetContactSettingByte(NULL, "Finger", "ShowVersion", 0)) {
- for (i = 0; i < DEFAULT_KN_FP_OVERLAYS2_COUNT; i++)
- Prepare(&def_kn_fp_overlays2_mask[i]);
- }
- else {
- for (i=0; i < DEFAULT_KN_FP_OVERLAYS2_NO_VER_COUNT; i++)
- Prepare(&def_kn_fp_overlays2_mask[i]);
- }
+ bEnable = DBGetContactSettingByte(NULL, "Finger", "Overlay2", 1) != 0;
+ if (DBGetContactSettingByte(NULL, "Finger", "ShowVersion", 0)) {
+ for (i = 0; i < DEFAULT_KN_FP_OVERLAYS2_COUNT; i++)
+ Prepare(&def_kn_fp_overlays2_mask[i], bEnable);
+ }
+ else {
+ for (i=0; i < DEFAULT_KN_FP_OVERLAYS2_NO_VER_COUNT; i++)
+ Prepare(&def_kn_fp_overlays2_mask[i], bEnable);
+ for (; i < DEFAULT_KN_FP_OVERLAYS2_COUNT; i++)
+ Prepare(&def_kn_fp_overlays2_mask[i], false);
}
- if (DBGetContactSettingByte(NULL, "Finger", "Overlay3", 1))
- for (i=0; i < DEFAULT_KN_FP_OVERLAYS3_COUNT; i++)
- Prepare(&def_kn_fp_overlays3_mask[i]);
+ bEnable = DBGetContactSettingByte(NULL, "Finger", "Overlay3", 1) != 0;
+ for (i=0; i < DEFAULT_KN_FP_OVERLAYS3_COUNT; i++)
+ Prepare(&def_kn_fp_overlays3_mask[i], bEnable);
}
/*
|