it's a good idea to unregister everything before calling STANDARD_HANGUP_LOCALUSERS

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6828 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 13 insertions, 4 deletions

diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index a1b2c41dd..4fd381fe5 100755
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -121,15 +121,24 @@ static int setcallerid_exec(struct ast_channel *chan, void *data)
 
 int unload_module(void)
 {
+	int res;
+
+	res = ast_unregister_application(app2);
+	res |= ast_unregister_application(app);
+
 	STANDARD_HANGUP_LOCALUSERS;
-	ast_unregister_application(app2);
-	return ast_unregister_application(app);
+
+	return res;
 }
 
 int load_module(void)
 {
-	ast_register_application(app2, setcallerid_pres_exec, synopsis2, descrip2);
-	return ast_register_application(app, setcallerid_exec, synopsis, descrip);
+	int res;
+	
+	res = ast_register_application(app2, setcallerid_pres_exec, synopsis2, descrip2);
+	res |= ast_register_application(app, setcallerid_exec, synopsis, descrip);
+
+	return res;
 }
 
 char *description(void)