diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-02-22 12:52:18 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2016-02-22 12:52:18 +0100 |
| commit | 0b63ccd0b5cb26883d6becb196fb98e4f95d0397 (patch) | |
| tree | d9c660b46e106d76c5953579eca45e49c4486cbf /src/modules/m_callerid.cpp | |
| parent | 7b6bd133ca4472f6cb8058d5e34e3c8b2af7e99a (diff) | |
| parent | 1624ab03b86542a2cb02eda809303144974755f3 (diff) | |
Merge insp20
Diffstat (limited to 'src/modules/m_callerid.cpp')
| -rw-r--r-- | src/modules/m_callerid.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index c844ef04f..0eb208138 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -89,7 +89,12 @@ struct CallerIDExtInfo : public ExtensionItem if (format == FORMAT_NETWORK) return; + void* old = get_raw(container); + if (old) + this->free(old); callerid_data* dat = new callerid_data; + set_raw(container, dat); + irc::commasepstream s(value); std::string tok; if (s.GetToken(tok)) @@ -107,10 +112,6 @@ struct CallerIDExtInfo : public ExtensionItem } } } - - void* old = set_raw(container, dat); - if (old) - this->free(old); } callerid_data* get(User* user, bool create) |