Bugfix: Import BrainSuite folder with interactive "Compute MNI transf…

…ormation"
brainstorm-tools · May 28, 2020 · 45c1c8d · 45c1c8d
1 parent c684f2c
commit 45c1c8d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/toolbox/core/bst_memory.m b/toolbox/core/bst_memory.m
@@ -98,6 +98,8 @@
     end
 
     % ===== CHECK IF LOADED =====
+    % Use short file name
+    MriFile = file_short(MriFile);
     % Check if surface is already loaded
     iMri = find(file_compare({GlobalData.Mri.FileName}, MriFile));
     % If MRI is not loaded yet: load it
@@ -3386,10 +3388,8 @@ function UnloadSurface(SurfaceFiles, isCloseFig)
 %% ===== UNLOAD MRI =====
 function UnloadMri(MriFile) %#ok<DEFNU>
     global GlobalData;
-    % Get SUBJECTS directory
-    ProtocolInfo = bst_get('ProtocolInfo');
     % Force relative path
-    MriFile = strrep(MriFile, ProtocolInfo.SUBJECTS, '');
+    MriFile = file_short(MriFile);
     % Check if MRI is already loaded
     iMri = find(file_compare({GlobalData.Mri.FileName}, MriFile));
     % If it is: unload it

diff --git a/toolbox/io/import_anatomy_bs.m b/toolbox/io/import_anatomy_bs.m
@@ -411,7 +411,7 @@
     BstHeadFile = tess_downsize( BstHeadHiFile, 1082, 'reducepatch' );
     % Load MRI
     bst_progress('start', 'Import BrainSuite folder', 'Filling holes in the head surface...');
-    sMri = bst_memory('LoadMri', BstMriFile);
+    sMri = in_mri_bst(BstMriFile);
     % Load head surface
     sHead = in_tess_bst(BstHeadFile);
     % Remove holes