Merge branch 'defaultfile'

By now the default file code seems quite matured, so in preparation for
2.0 we'll bring it back into master.

I made a few small clean-ups during the merge, but the merge itself is
very much straight forward.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 4 insertions, 0 deletions

diff --git a/file.c b/file.c
index b9a598e2a..ca39c8dd6 100644
--- a/file.c
+++ b/file.c
@@ -253,6 +253,10 @@ void parse_file(const char *filename, GError **error)
 	struct memblock mem;
 
 	if (readfile(filename, &mem) < 0) {
+		/* we don't want to display an error if this was the default file */
+		if (default_filename && ! strcmp(filename, default_filename))
+			return;
+
 		fprintf(stderr, "Failed to read '%s'.\n", filename);
 		if (error) {
 			*error = g_error_new(g_quark_from_string("subsurface"),