summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2014-12-04 20:10:23 +0100
committerAndreas Baumann <abaumann@yahoo.com>2014-12-04 20:10:23 +0100
commit5666e2ed46bc50d4176b24b1e0a77cd4b478bfc2 (patch)
tree70bbffd37285c980fd95b56b0f27da248ba3139e
parent0f5da2fce7911c1a0701dc78e4cb7ce10fbe25c2 (diff)
downloadbiruda-5666e2ed46bc50d4176b24b1e0a77cd4b478bfc2.tar.gz
biruda-5666e2ed46bc50d4176b24b1e0a77cd4b478bfc2.tar.bz2
fixed termination issues around worker and gio channels
-rw-r--r--src/biruda.conf2
-rw-r--r--src/worker.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/biruda.conf b/src/biruda.conf
index 33bbca6..3f3fed5 100644
--- a/src/biruda.conf
+++ b/src/biruda.conf
@@ -21,7 +21,7 @@ worker worker1
control = "tcp://localhost:5555"
execution = direct
command = "./workertest 60"
-# command = "workertest.exe"
+# command = "workertest.exe 60"
}
worker worker2
diff --git a/src/worker.c b/src/worker.c
index d0b4f52..03be16c 100644
--- a/src/worker.c
+++ b/src/worker.c
@@ -88,7 +88,7 @@ static gboolean watch_output( GIOChannel *channel, GIOCondition condition, gpoin
gchar *buf;
gsize len;
- if( condition == G_IO_HUP ) {
+ if( ( condition & G_IO_HUP ) == G_IO_HUP ) {
g_io_channel_unref( channel );
return FALSE;
}