Skip to content

[release/6.0] [tvOS] Be less eager in creating the non-existent special folders #59024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marek-safar merged 1 commit into from
Sep 14, 2021
Merged

[release/6.0] [tvOS] Be less eager in creating the non-existent special folders #59024

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[tvOS] Be less eager in creating the non-existent special folders 
Fixes #58787
  • Loading branch information
@filipnavara
filipnavara authored and github-actions committed Sep 13, 2021
commit 6cfc0493c1e4fa07e5fb975cc3cf3ad7f54f5f2f
7 changes: 4 additions & 3 deletions src/mono/System.Private.CoreLib/src/System/Environment.iOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,15 @@ static string CombineSearchPath(NSSearchPathDirectory searchPath, string subdire
static string CombineDocumentDirectory(string subdirectory)
{
#if TARGET_TVOS
string? path = CombineSearchPath(NSSearchPathDirectory.NSLibraryDirectory, Path.Combine("Caches", "Documents", subdirectory));
string? path = CombineSearchPath(NSSearchPathDirectory.NSLibraryDirectory, Path.Combine("Caches", "Documents"));
// Special version of CombineSearchPath which creates the path if needed.
// This isn't needed for "real" search paths which always exist, but on tvOS
// the base path is really a subdirectory we define rather than an OS directory.
// In order to not treat Directory.Exists(SpecialFolder.ApplicationData) differently
// on tvOS, guarantee that it exists by creating it here
if (!Directory.Exists (path))
Directory.CreateDirectory (path);
if (!Directory.Exists(path))
Directory.CreateDirectory(path);
path = Path.Combine(path, subdirectory);
#else
string? path = CombineSearchPath(NSSearchPathDirectory.NSDocumentDirectory, subdirectory);
#endif
Expand Down