zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Actually do what the comment says at the top of main() regarding not

Browse Source 
bombing out due to an option that we don't recognise but GTK will.
Somehow my basically workable plan had been completely nullified by
putting the error check in the wrong place.

[originally from svn r9733]
This commit is contained in:
Simon Tatham
2012-12-28 11:22:13 +00:00
parent e17bf4abec
commit 261a784d1e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk.c
View File

@ -2655,11 +2655,6 @@ int main(int argc, char **argv)
} }
} }
if (*errbuf) {
fputs(errbuf, stderr);
return 1;
}
/* /*
* Special standalone mode for generating puzzle IDs on the * Special standalone mode for generating puzzle IDs on the
* command line. Useful for generating puzzles to be printed * command line. Useful for generating puzzles to be printed
@ -2687,6 +2682,16 @@ int main(int argc, char **argv)
char *id; char *id;
document *doc = NULL; document *doc = NULL;
/*
* If we're in this branch, we should display any pending
* error message from the command line, since GTK isn't going
* to take another crack at making sense of it.
*/
if (*errbuf) {
fputs(errbuf, stderr);
return 1;
}
n = ngenerate; n = ngenerate;
me = midend_new(NULL, &thegame, NULL, NULL); me = midend_new(NULL, &thegame, NULL, NULL);