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

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6828 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 11 insertions, 4 deletions

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 5a14d5ba9..7675a917c 100755
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1791,16 +1791,23 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
 
 int unload_module(void)
 {
+	int res;
+
+	res = ast_unregister_application(app);
+	res |= ast_unregister_application(rapp);
+
 	STANDARD_HANGUP_LOCALUSERS;
-	ast_unregister_application(app);
-	return ast_unregister_application(rapp);
+	
+	return res;
 }
 
 int load_module(void)
 {
 	int res;
-	if (!(res = ast_register_application(app, dial_exec, synopsis, descrip)))
-		res = ast_register_application(rapp, retrydial_exec, rsynopsis, rdescrip);
+
+	res = ast_register_application(app, dial_exec, synopsis, descrip);
+	res |= ast_register_application(rapp, retrydial_exec, rsynopsis, rdescrip);
+	
 	return res;
 }