aboutsummaryrefslogtreecommitdiff
path: root/src/dirax.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2010-02-05 10:14:09 +0100
committerThomas White <taw@physics.org>2010-02-05 10:14:09 +0100
commit1374dfa38ef7bdb7c18e92d058f51b3d79895cec (patch)
tree91d8f70ed0cfd9369905b42032c711b82036719b /src/dirax.c
parent96046b5dbb09328b4dac40f363cd8157cf32b4fa (diff)
Tidy up abort()s
... to avoid the special hell reserved for programmers who do this kind of thing.
Diffstat (limited to 'src/dirax.c')
-rw-r--r--src/dirax.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/dirax.c b/src/dirax.c
index 9220c8cb..0849d750 100644
--- a/src/dirax.c
+++ b/src/dirax.c
@@ -264,8 +264,12 @@ static gboolean dirax_readable(GIOChannel *dirax, GIOCondition condition,
default :
/* Obviously, this never happens :) */
- ERROR("Unrecognised input mode!\n");
- abort();
+ ERROR("Unrecognised DirAx input mode! "
+ "I don't know how to understand DirAx\n");
+ waitpid(image->dirax_pid, NULL, 0);
+ g_io_channel_shutdown(image->dirax, FALSE, NULL);
+ image->dirax = NULL;
+ return FALSE;
}