@@ -490,27 +490,27 @@ export class UserDataProfileImportExportService extends Disposable implements IU
490
490
return undefined ;
491
491
}
492
492
493
- if ( profileTemplate . settings ) {
493
+ if ( profileTemplate . settings && ! profile . useDefaultFlags ?. settings ) {
494
494
progress ( localize ( 'progress settings' , "Applying Settings..." ) ) ;
495
495
await this . instantiationService . createInstance ( SettingsResource ) . apply ( profileTemplate . settings , profile ) ;
496
496
}
497
- if ( profileTemplate . keybindings ) {
497
+ if ( profileTemplate . keybindings && ! profile . useDefaultFlags ?. keybindings ) {
498
498
progress ( localize ( 'progress keybindings' , "Applying Keyboard Shortcuts..." ) ) ;
499
499
await this . instantiationService . createInstance ( KeybindingsResource ) . apply ( profileTemplate . keybindings , profile ) ;
500
500
}
501
- if ( profileTemplate . tasks ) {
501
+ if ( profileTemplate . tasks && ! profile . useDefaultFlags ?. tasks ) {
502
502
progress ( localize ( 'progress tasks' , "Applying Tasks..." ) ) ;
503
503
await this . instantiationService . createInstance ( TasksResource ) . apply ( profileTemplate . tasks , profile ) ;
504
504
}
505
- if ( profileTemplate . snippets ) {
505
+ if ( profileTemplate . snippets && ! profile . useDefaultFlags ?. snippets ) {
506
506
progress ( localize ( 'progress snippets' , "Applying Snippets..." ) ) ;
507
507
await this . instantiationService . createInstance ( SnippetsResource ) . apply ( profileTemplate . snippets , profile ) ;
508
508
}
509
- if ( profileTemplate . globalState ) {
509
+ if ( profileTemplate . globalState && ! profile . useDefaultFlags ?. globalState ) {
510
510
progress ( localize ( 'progress global state' , "Applying State..." ) ) ;
511
511
await this . instantiationService . createInstance ( GlobalStateResource ) . apply ( profileTemplate . globalState , profile ) ;
512
512
}
513
- if ( profileTemplate . extensions && extensions ) {
513
+ if ( profileTemplate . extensions && extensions && ! profile . useDefaultFlags ?. extensions ) {
514
514
progress ( localize ( 'progress extensions' , "Applying Extensions..." ) ) ;
515
515
await this . instantiationService . createInstance ( ExtensionsResource ) . apply ( profileTemplate . extensions , profile ) ;
516
516
}
0 commit comments