diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1999-05-05 11:34:03 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1999-05-05 11:34:03 +0000 |
| commit | 2d49c1f84a59e88e141376618bf51b8813536403 (patch) | |
| tree | 9fcc4285eb30bc91d2abfcdf96cfbf01e2be5ba0 /usr.sbin/sade/config.c | |
| parent | 9775e37869327775444a6625e70f2122d09b9773 (diff) | |
| download | src-2d49c1f84a59e88e141376618bf51b8813536403.tar.gz src-2d49c1f84a59e88e141376618bf51b8813536403.zip | |
Another round of updates for -current and 3.2
Notes
Notes:
svn path=/head/; revision=46503
Diffstat (limited to 'usr.sbin/sade/config.c')
| -rw-r--r-- | usr.sbin/sade/config.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 52e90f25f2e8..b2f0f6f5167d 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.127 1999/04/28 06:39:25 jkh Exp $ + * $Id: config.c,v 1.128 1999/04/28 07:20:11 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -558,8 +558,12 @@ tryagain: "utility."); dialog_clear(); systemExecute(execfile); - if (!file_readable("/etc/XF86Config") && !msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?")) - goto tryagain; + if (!file_readable("/etc/XF86Config")) { + if (!msgYesNo("The XFree86 configuration process seems to have\nfailed. Would you like to try again?")) + goto tryagain; + else + return DITEM_FAILURE | DITEM_RESTORE; + } configXDesktop(self); return DITEM_SUCCESS | DITEM_RESTORE; } |