LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

Fixed crash of musrview in case the XML startup file is present but cannot be parsed correctly

Browse Source
This commit is contained in:
Bastian M. Wojek
2011-06-14 17:53:33 +00:00
parent f75194750c
commit 8dc31cad54
11 changed files with 66 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/any2many.cpp
View File

@ -439,7 +439,7 @@ int main(int argc, char *argv[])
status = saxParser->ParseFile(startup_path_name);
// check for parse errors
if (status) { // error
cerr << endl << ">> any2many **WARNING** reading/parsing musrfit_startup.xml.";
cerr << endl << ">> any2many **WARNING** Reading/parsing musrfit_startup.xml failed.";
cerr << endl;
// clean up
if (saxParser) {
@ -454,7 +454,11 @@ int main(int argc, char *argv[])
}
// read all the necessary runs (raw data)
PRunDataHandler *dataHandler = new PRunDataHandler(&info, startupHandler->GetDataPathList());
PRunDataHandler *dataHandler;
if (startupHandler)
dataHandler = new PRunDataHandler(&info, startupHandler->GetDataPathList());
else
dataHandler = new PRunDataHandler(&info);
bool success = dataHandler->IsAllDataAvailable();
if (!success) {