fix non-display of (X-)Face when prefs_common.enable_avatars is AVATARS_ENABLE_RENDER (2)

[claws.git] / src / procheader.c

diff --git a/src/procheader.c b/src/procheader.c
index f5755b6a395694be369d68aa363a4a918629e301..864651af7af6354c52684384a17050b54e6ca457 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -663,9 +663,12 @@ static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
        
        msginfo->inreplyto = NULL;
 
-       if (avatar_hook_id == HOOK_NONE && (prefs_common.enable_avatars & AVATARS_ENABLE_CAPTURE)) {
-               avatar_hook_id = hooks_register_hook(AVATAR_HEADER_UPDATE_HOOKLIST, avatar_from_some_face, NULL);
-       } else if (avatar_hook_id != HOOK_NONE && !(prefs_common.enable_avatars & AVATARS_ENABLE_CAPTURE)) {
+       if (avatar_hook_id == HOOK_NONE &&
+           (prefs_common.enable_avatars && (AVATARS_ENABLE_CAPTURE || AVATARS_ENABLE_RENDER))) {
+               avatar_hook_id = hooks_register_hook(AVATAR_HEADER_UPDATE_HOOKLIST,
+                                                    avatar_from_some_face, NULL);
+       } else if (avatar_hook_id != HOOK_NONE &&
+                  !(prefs_common.enable_avatars && AVATARS_ENABLE_CAPTURE)) {
                hooks_unregister_hook(AVATAR_HEADER_UPDATE_HOOKLIST, avatar_hook_id);
                avatar_hook_id = HOOK_NONE;
        }