From 5b23efc3a2fd3f5e423f6dade7b702b8cb187272 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 14 May 2004 00:45:11 +0000 Subject: [PATCH] Make sure to save the registry files even if we failed to load them. --- server/registry.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/server/registry.c b/server/registry.c index 115494a3d6b..7796e59860b 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1416,13 +1416,15 @@ static void load_init_registry_from_file( const char *filename, struct key *key { FILE *f; - if (!(f = fopen( filename, "r" ))) return; - load_keys( key, f, 0 ); - fclose( f ); - if (get_error() == STATUS_NOT_REGISTRY_FILE) - fatal_error( "%s is not a valid registry file\n", filename ); - if (get_error()) - fatal_error( "loading %s failed with error %x\n", filename, get_error() ); + if ((f = fopen( filename, "r" ))) + { + load_keys( key, f, 0 ); + fclose( f ); + if (get_error() == STATUS_NOT_REGISTRY_FILE) + fatal_error( "%s is not a valid registry file\n", filename ); + if (get_error()) + fatal_error( "loading %s failed with error %x\n", filename, get_error() ); + } if (!(key->flags & KEY_VOLATILE)) {