chansrv: check for nil

ulab-next-nosound
Jay Sorg 10 years ago
parent 9597e90b31
commit d17c4a78fb

@ -38,8 +38,7 @@
static struct trans *g_lis_trans = 0; static struct trans *g_lis_trans = 0;
static struct trans *g_con_trans = 0; static struct trans *g_con_trans = 0;
static struct trans *g_api_lis_trans = 0; static struct trans *g_api_lis_trans = 0;
static struct list *g_api_con_trans_list = 0; static struct list *g_api_con_trans_list = 0; /* list of apps using api functions */
//static struct trans *g_api_con_trans = 0;
static struct chan_item g_chan_items[32]; static struct chan_item g_chan_items[32];
static int g_num_chan_items = 0; static int g_num_chan_items = 0;
static int g_cliprdr_index = -1; static int g_cliprdr_index = -1;
@ -807,10 +806,13 @@ my_api_trans_data_in(struct trans *trans)
return 0; return 0;
} }
if (g_api_con_trans_list != 0)
{
if (list_index_of(g_api_con_trans_list, (tintptr) trans) == -1) if (list_index_of(g_api_con_trans_list, (tintptr) trans) == -1)
{ {
return 1; return 1;
} }
}
LOGM((LOG_LEVEL_DEBUG, "my_api_trans_data_in:")); LOGM((LOG_LEVEL_DEBUG, "my_api_trans_data_in:"));
@ -1185,6 +1187,8 @@ channel_thread_loop(void *in_val)
wobjs, &num_wobjs); wobjs, &num_wobjs);
trans_get_wait_objs(g_api_lis_trans, objs, &num_objs); trans_get_wait_objs(g_api_lis_trans, objs, &num_objs);
if (g_api_con_trans_list != 0)
{
for (index = g_api_con_trans_list->count - 1; index >= 0; index--) for (index = g_api_con_trans_list->count - 1; index >= 0; index--)
{ {
ltran = (struct trans *) list_get_item(g_api_con_trans_list, index); ltran = (struct trans *) list_get_item(g_api_con_trans_list, index);
@ -1193,6 +1197,7 @@ channel_thread_loop(void *in_val)
trans_get_wait_objs(ltran, objs, &num_objs); trans_get_wait_objs(ltran, objs, &num_objs);
} }
} }
}
xcommon_get_wait_objs(objs, &num_objs, &timeout); xcommon_get_wait_objs(objs, &num_objs, &timeout);
sound_get_wait_objs(objs, &num_objs, &timeout); sound_get_wait_objs(objs, &num_objs, &timeout);

Loading…
Cancel
Save