From 494eff54d1138b567e371dd5e5f27e85844ada20 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 5 Jun 2014 17:15:18 +0200 Subject: [PATCH] Fix wrong binary logic --- src/avatars.c | 2 +- src/procheader.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/avatars.c b/src/avatars.c index a68286d85..b6177b190 100644 --- a/src/avatars.c +++ b/src/avatars.c @@ -60,7 +60,7 @@ gboolean avatars_internal_rendering_hook(gpointer source, gpointer data) AvatarRender *avatarr = (AvatarRender *)source; gchar *aface; - if (!(prefs_common.enable_avatars | AVATARS_ENABLE_RENDER)) { + if (!(prefs_common.enable_avatars & AVATARS_ENABLE_RENDER)) { debug_print("Internal rendering of avatars is disabled"); return FALSE; } diff --git a/src/procheader.c b/src/procheader.c index fad05e1bf..330a3107a 100644 --- a/src/procheader.c +++ b/src/procheader.c @@ -533,9 +533,9 @@ static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags, msginfo->inreplyto = NULL; - if (avatar_hook_id == 0 && (prefs_common.enable_avatars | AVATARS_ENABLE_CAPTURE)) { + if (avatar_hook_id == 0 && (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 != 0 && !(prefs_common.enable_avatars | AVATARS_ENABLE_CAPTURE)) { + } else if (avatar_hook_id != 0 && !(prefs_common.enable_avatars & AVATARS_ENABLE_CAPTURE)) { hooks_unregister_hook(AVATAR_HEADER_UPDATE_HOOKLIST, avatar_hook_id); avatar_hook_id = 0; } -- 2.25.1