Mercurial > hg > orthanc
comparison OrthancServer/Sources/OrthancInitialization.cpp @ 5195:32df369198ac
fix /tools/reset crashing when ExtraMainDicomTags were defined
author | Alain Mazy <am@osimis.io> |
---|---|
date | Tue, 28 Mar 2023 10:48:13 +0200 |
parents | 0ea402b4d901 |
children | e7529e6241d2 |
comparison
equal
deleted
inserted
replaced
5185:0ea402b4d901 | 5195:32df369198ac |
---|---|
202 | 202 |
203 static void LoadMainDicomTags(const Json::Value& configuration) | 203 static void LoadMainDicomTags(const Json::Value& configuration) |
204 { | 204 { |
205 static const char* const EXTRA_MAIN_DICOM_TAGS = "ExtraMainDicomTags"; | 205 static const char* const EXTRA_MAIN_DICOM_TAGS = "ExtraMainDicomTags"; |
206 | 206 |
207 DicomMap::ResetDefaultMainDicomTags(); | |
208 | |
207 if (configuration.type() != Json::objectValue || | 209 if (configuration.type() != Json::objectValue || |
208 !configuration.isMember(EXTRA_MAIN_DICOM_TAGS) || | 210 !configuration.isMember(EXTRA_MAIN_DICOM_TAGS) || |
209 configuration[EXTRA_MAIN_DICOM_TAGS].type() != Json::objectValue) | 211 configuration[EXTRA_MAIN_DICOM_TAGS].type() != Json::objectValue) |
210 { | 212 { |
211 return; | 213 return; |