Fix chan_oss buglets (bug #5618)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6967 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
ddf63421f6
commit
a67c2702c5
|
@ -845,6 +845,7 @@ static int oss_indicate(struct ast_channel *c, int cond)
|
||||||
|
|
||||||
case -1:
|
case -1:
|
||||||
o->cursound = -1;
|
o->cursound = -1;
|
||||||
|
o->nosound = 0; /* when cursound is -1 nosound must be 0 */
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
case AST_CONTROL_VIDUPDATE:
|
case AST_CONTROL_VIDUPDATE:
|
||||||
|
@ -1081,6 +1082,7 @@ static int console_flash(int fd, int argc, char *argv[])
|
||||||
if (argc != 1)
|
if (argc != 1)
|
||||||
return RESULT_SHOWUSAGE;
|
return RESULT_SHOWUSAGE;
|
||||||
o->cursound = -1;
|
o->cursound = -1;
|
||||||
|
o->nosound = 0; /* when cursound is -1 nosound must be 0 */
|
||||||
if (!o->owner) { /* XXX maybe !o->hookstate too ? */
|
if (!o->owner) { /* XXX maybe !o->hookstate too ? */
|
||||||
ast_cli(fd, "No call to flash\n");
|
ast_cli(fd, "No call to flash\n");
|
||||||
return RESULT_FAILURE;
|
return RESULT_FAILURE;
|
||||||
|
@ -1293,6 +1295,7 @@ static struct chan_oss_pvt * store_config(struct ast_config *cfg, char *ctg)
|
||||||
o->name = strdup(ctg);
|
o->name = strdup(ctg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
o->lastopen = ast_tvnow(); /* don't leave it 0 or tvdiff may wrap */
|
||||||
/* fill other fields from configuration */
|
/* fill other fields from configuration */
|
||||||
for (v = ast_variable_browse(cfg, ctg);v; v=v->next) {
|
for (v = ast_variable_browse(cfg, ctg);v; v=v->next) {
|
||||||
M_START(v->name, v->value);
|
M_START(v->name, v->value);
|
||||||
|
|
Loading…
Reference in New Issue