From eb8fada05663c62a344aa2ce62db5e82eb59cdf0 Mon Sep 17 00:00:00 2001
From: Riza Sulistyo <riza@teluu.com>
Date: Thu, 23 May 2013 03:48:31 +0000
Subject: Re #1643:  - Fix duplicate shortcut for video commands  - Fix restart
 command bug on legacy mode  - Fix restart bug when using add-buddy options

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4522 74dad513-b988-da41-8d7b-12977e46ad98
---
 pjsip-apps/src/pjsua/main.c             | 7 ++++---
 pjsip-apps/src/pjsua/pjsua_app_cli.c    | 6 +++---
 pjsip-apps/src/pjsua/pjsua_app_config.c | 1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'pjsip-apps')

diff --git a/pjsip-apps/src/pjsua/main.c b/pjsip-apps/src/pjsua/main.c
index 048eea8f..ef89e6b4 100644
--- a/pjsip-apps/src/pjsua/main.c
+++ b/pjsip-apps/src/pjsua/main.c
@@ -34,8 +34,10 @@ void on_app_started(pj_status_t status, const char *msg)
 
 void on_app_stopped(pj_bool_t restart, int argc, char** argv)
 {
-    cfg.argc = argc;
-    cfg.argv = argv;
+    if (argv) {
+	cfg.argc = argc;
+	cfg.argv = argv;
+    }
 
     running = restart;
 }
@@ -107,7 +109,6 @@ int main(int argc, char *argv[])
 	if (status == PJ_SUCCESS) {
 	    status = pjsua_app_run(PJ_TRUE);
 	} else {
-	    pj_perror(3, THIS_FILE, status, "Failed init");
 	    running = PJ_FALSE;
 	}
 
diff --git a/pjsip-apps/src/pjsua/pjsua_app_cli.c b/pjsip-apps/src/pjsua/pjsua_app_cli.c
index 1288ec81..795c084b 100644
--- a/pjsip-apps/src/pjsua/pjsua_app_cli.c
+++ b/pjsip-apps/src/pjsua/pjsua_app_cli.c
@@ -2897,9 +2897,9 @@ static pj_status_t add_video_command(pj_cli_t *cli)
 	"       desc='Renderer device Id'/>"
 	"    </CMD>"
 	"  </CMD>"
-	"  <CMD name='call' id='6004' sc='cl' " 
+	"  <CMD name='call' id='6004' sc='vcl' "
 	"   desc='Video call commands/settings'>"
-	"    <CMD name='rx' id='60041' sc='rx' "
+	"    <CMD name='rx' id='60041' "
 	"     desc='Enable/disable video RX for stream in curr call'>"
 	"      <ARG name='enable_option' type='choice' "
 	"       desc='Enable/Disable option'>"
@@ -2936,7 +2936,7 @@ static pj_status_t add_video_command(pj_cli_t *cli)
 	"       desc='Device Id'/>"
 	"    </CMD>"
 	"  </CMD>"
-	"  <CMD name='device' id='6005' sc='v' desc='Video device commands'>"
+	"  <CMD name='device' id='6005' sc='vv' desc='Video device commands'>"
 	"    <CMD name='list' id='60051' desc='Show all video devices'/>"
 	"    <CMD name='refresh' id='60052' desc='Refresh video device list'/>"
 	"    <CMD name='prev' id='60053' "
diff --git a/pjsip-apps/src/pjsua/pjsua_app_config.c b/pjsip-apps/src/pjsua/pjsua_app_config.c
index cdcc3cf4..5befc087 100644
--- a/pjsip-apps/src/pjsua/pjsua_app_config.c
+++ b/pjsip-apps/src/pjsua/pjsua_app_config.c
@@ -1455,6 +1455,7 @@ static void default_config()
     for (i=0; i<PJ_ARRAY_SIZE(cfg->buddy_cfg); ++i)
 	pjsua_buddy_config_default(&cfg->buddy_cfg[i]);
 
+    cfg->buddy_cnt = 0;
     cfg->vid.vcapture_dev = PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
     cfg->vid.vrender_dev = PJMEDIA_VID_DEFAULT_RENDER_DEV;
     cfg->aud_cnt = 1;
-- 
cgit v1.2.3