From 6558648dc3cf656a06d82ab9f19eecc3b702f98b Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 26 Jun 2020 13:05:17 -0600
Subject: [PATCH] callerid: don't clobber other modules

---
 modules/um_callerid.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/um_callerid.c b/modules/um_callerid.c
index 371c0c7d..452b7b96 100644
--- a/modules/um_callerid.c
+++ b/modules/um_callerid.c
@@ -154,6 +154,9 @@ h_can_invite(void *vdata)
 	struct Client *source_p = data->client;
 	struct Client *target_p = data->target;
 
+	if (data->approved)
+		return;
+
 	if (!add_callerid_accept_for_source(MESSAGE_TYPE_PRIVMSG, source_p, target_p))
 	{
 		data->approved = ERR_TARGUMODEG;
@@ -176,6 +179,9 @@ h_hdl_privmsg_user(void *vdata)
 	struct Client *source_p = data->source_p;
 	struct Client *target_p = data->target_p;
 
+	if (data->approved)
+		return;
+
 	if (!add_callerid_accept_for_source(msgtype, source_p, target_p))
 	{
 		data->approved = ERR_TARGUMODEG;