mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
bug 298590: Restore Defaults does not quite restore Folder Settings
Restoring original logic of finding parent folder settings from revisions earlier than 1.65
This commit is contained in:
parent
b6ffaf6758
commit
172ea442ad
1 changed files with 9 additions and 8 deletions
|
@ -2505,6 +2505,8 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
|
|||
for(parent = child.getParentContainer();
|
||||
(parentRcData = (CResourceData)parent.getValue()).getType() != ICSettingBase.SETTING_FOLDER;
|
||||
parent = parent.getParentContainer()) {
|
||||
// no body, this loop is to find the parent
|
||||
}
|
||||
if(!settingsCustomized(project, (CFolderData)parentRcData, (CFolderData)childRcData)){
|
||||
try {
|
||||
data.removeResourceData(childRcData);
|
||||
|
@ -2514,7 +2516,6 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
|
|||
CCorePlugin.log(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
parent = child.getParentContainer();
|
||||
if(!settingsCustomized(project, (CResourceData)parent.getValue(), (CFileData)childRcData)){
|
||||
|
|
Loading…
Add table
Reference in a new issue