diff options
Diffstat (limited to 'registry/source/registry.cxx')
| -rw-r--r-- | registry/source/registry.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index 5851199057a3..345631ad1773 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -361,7 +361,7 @@ static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg, return _ret; _ret = pReg->loadKey(pNewKey, regFileName, bWarnings, bReport); - if (_ret == REG_MERGE_ERROR || (_ret == REG_MERGE_CONFLICT && bWarnings)) + if (_ret != REG_NO_ERROR && (_ret != REG_MERGE_CONFLICT || bWarnings)) { if (pNewKey != pKey) (void) pKey->closeKey(pNewKey); |