aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_oss.c
diff options
context:
space:
mode:
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-30 15:45:15 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-30 15:45:15 +0000
commitf9022c94ccbf58642ea8065837d976a157d9e960 (patch)
tree5615b8941ba0f6e898b4bbe5b41f9826f5ef10a2 /channels/chan_oss.c
parent69fe073f954ca96bb0ef008f195a80b902cca291 (diff)
implement the 'freeze' function for incoming frames;
fix a bug which caused a crash when a videodevice was specified after startgui=1 in the config file. This also involves a slightly different method to determine if the gui is active or not. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@126572 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_oss.c')
-rw-r--r--channels/chan_oss.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index e665eb2e9..a3908a504 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -1387,6 +1387,11 @@ static struct chan_oss_pvt *store_config(struct ast_config *cfg, char *ctg)
system(cmd);
ast_free(cmd);
}
+
+ /* if the config file requested to start the GUI, do it */
+ if (get_gui_startup(o->env))
+ console_video_start(o->env, NULL);
+
if (o == &oss_default) /* we are done with the default */
return NULL;