From 7f3aabd577bb415d0eaa349457baf7fb9ba0f365 Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@stfc.ac.uk>
Date: Mon, 1 Jul 2013 10:23:04 +0100
Subject: [PATCH] Loader search does descriptor callback even if exception
thrown.
Refs #7523
---
Code/Mantid/Framework/API/src/FileLoaderRegistry.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Code/Mantid/Framework/API/src/FileLoaderRegistry.cpp b/Code/Mantid/Framework/API/src/FileLoaderRegistry.cpp
index 6d90dd86ad6..14e83055142 100644
--- a/Code/Mantid/Framework/API/src/FileLoaderRegistry.cpp
+++ b/Code/Mantid/Framework/API/src/FileLoaderRegistry.cpp
@@ -53,8 +53,6 @@ namespace Mantid
try
{
const int confidence = alg->confidence(descriptor);
- callback.apply(descriptor);
-
if(confidence > maxConfidence) // strictly greater
{
bestLoader = name;
@@ -65,6 +63,7 @@ namespace Mantid
{
logger.warning() << "Checking loader '" << name << "' raised an error: '" << exc.what() << "'. Loader skipped." << std::endl;
}
+ callback.apply(descriptor);
}
return bestLoader;
}
--
GitLab