summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2017-11-02 11:01:59 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2017-11-02 14:32:24 +0100
commit05d15643c40b571059f8a9474cbf0c5056e40873 (patch)
tree976785c9e7f818c9c76efd881128d9ae7e4a75df /configmgr
parentcc6128d727d1e92b2aa2b4dd9cbae8e045cf1f6b (diff)
Winreg configuration layer: don't assert on user input
Change-Id: I1314e37315450ead3bf131ed3fabd9351a88a4e5 Reviewed-on: https://gerrit.libreoffice.org/44191 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/winreg.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
index ea24c0ebacb4..e9c6e8359510 100644
--- a/configmgr/source/winreg.cxx
+++ b/configmgr/source/winreg.cxx
@@ -167,7 +167,8 @@ void dumpWindowsRegistryKey(HKEY hKey, OUString const & aKeyName, TempFile &aFil
}
}
// type and external are mutually exclusive
- assert(aType.isEmpty() || !bExternal);
+ if (bExternal)
+ aType.clear();
sal_Int32 aLastSeparator = aKeyName.lastIndexOf('\\');
OUString aPathAndNodes = aKeyName.copy(0, aLastSeparator);