Skip to content

Commit f25e6fe

Browse files
committed
[fix rebase] remove deep clone of ext pkgs
1 parent e9f83fc commit f25e6fe

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,8 @@ Model::CascadiaSettings CascadiaSettings::Copy() const
114114
settings->_allProfiles = winrt::single_threaded_observable_vector(std::move(allProfiles));
115115
settings->_activeProfiles = winrt::single_threaded_observable_vector(std::move(activeProfiles));
116116

117-
// fragment extensions, dynamic profile generators, and extension packages don't need a deep clone
117+
// extension packages don't need a deep clone
118118
// because they're fully immutable. We can just copy the reference over instead.
119-
settings->_fragmentExtensions = _fragmentExtensions;
120-
settings->_dynamicProfileGeneratorExtensions = _dynamicProfileGeneratorExtensions;
121119
settings->_extensionPackages = _extensionPackages;
122120
}
123121

src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,7 @@ CascadiaSettings::CascadiaSettings(SettingsLoader&& loader) :
13521352

13531353
for (auto [_, extPkg] : loader.extensionPackageMap)
13541354
{
1355-
_extensionPackages.Append(extPkg->Copy());
1355+
_extensionPackages.Append(*extPkg);
13561356
}
13571357

13581358
_resolveDefaultProfile();

0 commit comments

Comments
 (0)