From 391c884671464a2189d0aa01e001ab62d1e9adba Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sun, 15 Mar 2009 01:21:34 +0000 Subject: [PATCH] move stop up a bit git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12607 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/switch.c b/src/switch.c index f397e4a05a..5dcb22a9ae 100644 --- a/src/switch.c +++ b/src/switch.c @@ -270,7 +270,6 @@ int main(int argc, char *argv[]) int nc = 0; /* TRUE if we are running in noconsole mode */ pid_t pid = 0; int x; - int die = 0; char *usageDesc; int alt_dirs = 0; int known_opt; @@ -470,8 +469,7 @@ int main(int argc, char *argv[]) } if (argv[x] && !strcmp(argv[x], "-stop")) { - die++; - known_opt++; + return freeswitch_kill_background(); } if (argv[x] && !strcmp(argv[x], "-nc")) { @@ -594,10 +592,6 @@ int main(int argc, char *argv[]) return 255; } - if (die) { - return freeswitch_kill_background(); - } - if (alt_dirs && alt_dirs != 3) { fprintf(stderr, "You must specify all or none of -conf, -log, and -db\n"); return 255;