diff options
| author | daniel <danieruru@gmail.com> | 2013-01-29 01:05:12 +0900 |
|---|---|---|
| committer | daniel <danieruru@gmail.com> | 2013-01-29 01:05:12 +0900 |
| commit | 34edd87cbc6f35d8f199e726dd00a4aa763dcbff (patch) | |
| tree | 7fe268866e0508150a0f563a2f6f24da39bc2d98 /instr-daemon.c | |
| parent | e15319368bf6d69fe84dc5afa63f740252c8dfcc (diff) | |
| parent | 8152c5b83f164d4f7e265f8c1bb2d81e88a5bf97 (diff) | |
Merge branch 'vxi' of grenfell.avtechpulse.com:Instrument into vxi
Diffstat (limited to 'instr-daemon.c')
| -rw-r--r-- | instr-daemon.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/instr-daemon.c b/instr-daemon.c index e1d5c8e..e110863 100644 --- a/instr-daemon.c +++ b/instr-daemon.c @@ -294,9 +294,11 @@ int main(int argc, char **argv) g_timeout_add (20, (GSourceFunc) periodic_poll, NULL); g_timeout_add (100, (GSourceFunc) finish_boot, NULL); - GThread *vxithread =g_thread_create(vxithreadfunc, NULL,false, NULL); - if(vxithread == NULL) - printf("Couldn't create vxi thread\n"); + if (globals.Flash.vxi_enabled) { + GThread *vxithread =g_thread_create(vxithreadfunc, NULL,false, NULL); + if(vxithread == NULL) + printf("Couldn't create vxi thread\n"); + } g_main_loop_run (loop); |