maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Check if found folder is not null when loading fragments (#9477)

Browse source 
When loading fragments, check if the public folder is not null first

Closes #9473
This commit is contained in:
PankajBhojwani 2021-03-15 09:34:30 -07:00 committed by GitHub
parent 28da6c4ecb
commit fbdfc4d446
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
View file

@ -485,21 +485,24 @@ void CascadiaSettings::_LoadFragmentExtensions()
// So we use another mutex and condition variable
auto foundFolder = _extractValueFromTaskWithoutMainThreadAwait(ext.GetPublicFolderAsync());
// the StorageFolder class has its own methods for obtaining the files within the folder
// however, all those methods are Async methods
// you may have noticed that we need to resort to clunky implementations for async operations
// (they are in _extractValueFromTaskWithoutMainThreadAwait)
// so for now we will just take the folder path and access the files that way
auto path = winrt::to_string(foundFolder.Path());
path.append(FragmentsSubDirectory);
// If the directory exists, use the fragments in it
if (std::filesystem::exists(path))
if (foundFolder)
{
const auto jsonFiles = _AccumulateJsonFilesInDirectory(til::u8u16(path));
// the StorageFolder class has its own methods for obtaining the files within the folder
// however, all those methods are Async methods
// you may have noticed that we need to resort to clunky implementations for async operations
// (they are in _extractValueFromTaskWithoutMainThreadAwait)
// so for now we will just take the folder path and access the files that way
auto path = winrt::to_string(foundFolder.Path());
path.append(FragmentsSubDirectory);
// Provide the package name as the source
_ParseAndLayerFragmentFiles(jsonFiles, ext.Package().Id().FamilyName().c_str());
// If the directory exists, use the fragments in it
if (std::filesystem::exists(path))
{
const auto jsonFiles = _AccumulateJsonFilesInDirectory(til::u8u16(path));
// Provide the package name as the source
_ParseAndLayerFragmentFiles(jsonFiles, ext.Package().Id().FamilyName().c_str());
}
}
}
}