From d7fe6d0e8eba772af6603ac2631b4553687b433c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 8 Jun 2020 10:39:30 +0300 Subject: =?UTF-8?q?fixes=20#2433=20(NewStory:=20XMPP=20Chat=20States=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0=D1=8E=D1=82?= =?UTF-8?q?=D1=81=D1=8F=20=D0=BA=D0=B0=D0=BA=20=D0=BD=D0=B5=D0=B8=D0=B7?= =?UTF-8?q?=D0=B2=D0=B5=D1=81=D1=82=D0=BD=D1=8B=D0=B5=20=D1=81=D0=BE=D0=B1?= =?UTF-8?q?=D1=8B=D1=82=D0=B8=D1=8F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/NewStory/src/templates.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'plugins/NewStory/src/templates.h') diff --git a/plugins/NewStory/src/templates.h b/plugins/NewStory/src/templates.h index 4349ea79d5..2368aa731b 100644 --- a/plugins/NewStory/src/templates.h +++ b/plugins/NewStory/src/templates.h @@ -9,22 +9,26 @@ enum struct TemplateVars { - bool del[256]; - wchar_t* val[256]; + struct { + wchar_t *val; + bool del; + } + vars[256]; __forceinline wchar_t* GetVar(uint8_t id) { - return val[id]; + return vars[id].val; } __forceinline void SetVar(uint8_t id, const wchar_t *v, bool d) { - if (val[id] && del[id]) - mir_free(val[id]); - val[id] = mir_wstrdup(v); - del[id] = d; + auto &V = vars[id]; + if (V.val && V.del) + mir_free(V.val); + V.val = mir_wstrdup(v); + V.del = d; } }; -typedef void(*VarFunc)(int mode, TemplateVars* vars, MCONTACT hContact, ItemData* item); +typedef void (*VarFunc)(int mode, TemplateVars *vars, MCONTACT hContact, ItemData *item); struct TemplateInfo { -- cgit v1.2.3