mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Fix for hasCustomSettings state calculation
This commit is contained in:
parent
8b988eb154
commit
2fda9019bc
2 changed files with 4 additions and 4 deletions
|
@ -981,15 +981,15 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
|
||||||
String ext = path.getFileExtension();
|
String ext = path.getFileExtension();
|
||||||
if(ext == null)
|
if(ext == null)
|
||||||
ext = ""; //$NON-NLS-1$
|
ext = ""; //$NON-NLS-1$
|
||||||
ITool tool = ((FolderInfo)parentRc).getToolFromInputExtension(ext);
|
ITool otherTool = ((FolderInfo)parentRc).getToolFromInputExtension(ext);
|
||||||
if(tool == null)
|
if(otherTool == null)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
ITool[] tti = getToolsToInvoke();
|
ITool[] tti = getToolsToInvoke();
|
||||||
if(tti.length != 1)
|
if(tti.length != 1)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return ((Tool)tool).hasCustomSettings((Tool)tti[0]);
|
return ((Tool)tti[0]).hasCustomSettings((Tool)otherTool);
|
||||||
}
|
}
|
||||||
ITool[] tools = getTools();
|
ITool[] tools = getTools();
|
||||||
ITool[] otherTools = ((IFileInfo)parentRc).getTools();
|
ITool[] otherTools = ((IFileInfo)parentRc).getTools();
|
||||||
|
|
|
@ -2705,7 +2705,7 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert
|
||||||
ITool[] tools = getTools();
|
ITool[] tools = getTools();
|
||||||
ITool[] otherTools = tCh.getTools();
|
ITool[] otherTools = tCh.getTools();
|
||||||
if(tools.length != otherTools.length)
|
if(tools.length != otherTools.length)
|
||||||
return false;
|
return true;
|
||||||
|
|
||||||
for(int i = 0; i < tools.length; i++){
|
for(int i = 0; i < tools.length; i++){
|
||||||
Tool tool = (Tool)tools[i];
|
Tool tool = (Tool)tools[i];
|
||||||
|
|
Loading…
Add table
Reference in a new issue