diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-08-12 13:07:31 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-08-12 13:07:31 +0000 |
| commit | 262955b51eb11e3f8e38546d716f9820231854e1 (patch) | |
| tree | 72d95f7d509bac7d9cb98247caa5251d5b48dbbb /plugins/TabSRMM/src/msgdlgutils.cpp | |
| parent | 4250dbe2701cf839274cefa8803c9f7141d545bf (diff) | |
fix for displaying avatars in tabSRMM when "Display avatars" option is "always on"
git-svn-id: http://svn.miranda-ng.org/main/trunk@10164 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/msgdlgutils.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/msgdlgutils.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 584854f756..46f1a0e2a4 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -614,18 +614,17 @@ bool TSAPI GetAvatarVisibility(HWND hwndDlg, TWindowData *dat) case 3: // on, if present
case 1:
HBITMAP hbm = (dat->ace && !(dat->ace->dwFlags & AVS_HIDEONCLIST)) ? dat->ace->hbmPic : 0;
-
- if (!dat->hwndContactPic)
- dat->hwndContactPic = CreateWindowEx(WS_EX_TOPMOST, AVATAR_CONTROL_CLASS, _T(""), WS_VISIBLE | WS_CHILD, 1, 1, 1, 1, GetDlgItem(hwndDlg, IDC_CONTACTPIC), (HMENU)0, NULL, NULL);
-
dat->bShowAvatar = (hbm && hbm != PluginConfig.g_hbmUnknown);
break;
}
- if (dat->bShowAvatar)
+ if (dat->bShowAvatar) {
+ if (!dat->hwndContactPic)
+ dat->hwndContactPic = CreateWindowEx(WS_EX_TOPMOST, AVATAR_CONTROL_CLASS, _T(""), WS_VISIBLE | WS_CHILD, 1, 1, 1, 1, GetDlgItem(hwndDlg, IDC_CONTACTPIC), (HMENU)0, NULL, NULL);
+
dat->bShowAvatar = hideOverride == 0 ? 0 : dat->bShowAvatar;
- else
- dat->bShowAvatar = hideOverride == 1 ? 1 : dat->bShowAvatar;
+ }
+ else dat->bShowAvatar = hideOverride == 1 ? 1 : dat->bShowAvatar;
// reloads avatars
if (dat->hwndPanelPic) { // shows contact or user picture, depending on panel visibility
|