Commit 8b145923 authored by jayd1860's avatar jayd1860
Browse files

v1.14.3

-- Change to avoid path conflicts with other tools .
parent 46c5fd63
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ paths_excl_str = {};
if options.conflcheck
        
    % Get all workspace paths that have similar functions sets with current applications
    appmainfunc = {'Homer2_UI.m','Homer3.m','brainScape.m'};
    appmainfunc = {'AtlasViewerGUI.m','Homer2_UI.m','Homer3.m','brainScape.m','AcqDataClass.m'};
    
    kk=1;
    wsidx = [];
+8 −8
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ function setpaths(options_str)

% Parse arguments
if ~exist('options_str','var')
    options_str = 1;
    options_str = 'rmpathconfl';
end
options = parseOptions(options_str);

@@ -69,13 +69,13 @@ if ~options.add
end

[paths, wspaths, paths_excl_str] = getpaths(options);
if ~isempty(wspaths)
    if pathscompare(wspaths{1}, pwd)
        fprintf('Current workspace %s already at the top of the search path.\n', wspaths{1});
        addwspaths(wspaths, paths_excl_str, options);
        return;
    end
end
% if ~isempty(wspaths)
%     if pathscompare(wspaths{1}, pwd)
%         fprintf('Current workspace %s already at the top of the search path.\n', wspaths{1});
%         addwspaths(wspaths, paths_excl_str, options);
%         return;
%     end
% end


% Add or remove paths for this application