t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix storage selection

Browse Source
This commit is contained in:
rootdarkarchon
2023-06-01 09:53:22 +02:00
parent 5f18d736da
commit 04ab5f6af0
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MareSynchronos/UI/SettingsUi.cs
View File

@@ -310,7 +310,6 @@ public class SettingsUi : WindowMediatorSubscriberBase
#if DEBUG #if DEBUG
if (LastCreatedCharacterData != null && ImGui.TreeNode("Last created character data")) if (LastCreatedCharacterData != null && ImGui.TreeNode("Last created character data"))
{ {
foreach (var l in JsonSerializer.Serialize(LastCreatedCharacterData, new JsonSerializerOptions() { WriteIndented = true }).Split('\n')) foreach (var l in JsonSerializer.Serialize(LastCreatedCharacterData, new JsonSerializerOptions() { WriteIndented = true }).Split('\n'))
{ {
ImGui.Text($"{l}"); ImGui.Text($"{l}");
@@ -391,7 +390,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
_configService.Current.ExportFolder = Path.GetDirectoryName(path) ?? string.Empty; _configService.Current.ExportFolder = Path.GetDirectoryName(path) ?? string.Empty;
_configService.Save(); _configService.Save();
Task.Run(() => _ = Task.Run(() =>
{ {
try try
{ {
@@ -446,7 +445,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
ImGui.BeginDisabled(); ImGui.BeginDisabled();
if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Clear local storage") && UiSharedService.CtrlPressed() && _readClearCache) if (UiSharedService.IconTextButton(FontAwesomeIcon.Trash, "Clear local storage") && UiSharedService.CtrlPressed() && _readClearCache)
{ {
Task.Run(() => _ = Task.Run(() =>
{ {
foreach (var file in Directory.GetFiles(_configService.Current.CacheFolder)) foreach (var file in Directory.GetFiles(_configService.Current.CacheFolder))
{ {

2
MareSynchronos/UI/UISharedService.cs
View File

@@ -474,7 +474,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
_isPenumbraDirectory = string.Equals(path.ToLowerInvariant(), _ipcManager.PenumbraModDirectory?.ToLowerInvariant(), StringComparison.Ordinal); _isPenumbraDirectory = string.Equals(path.ToLowerInvariant(), _ipcManager.PenumbraModDirectory?.ToLowerInvariant(), StringComparison.Ordinal);
_isDirectoryWritable = IsDirectoryWritable(path); _isDirectoryWritable = IsDirectoryWritable(path);
_cacheDirectoryHasOtherFilesThanCache = Directory.GetFiles(path, "*", SearchOption.AllDirectories).Any(f => new FileInfo(f).Name.Length != 40); _cacheDirectoryHasOtherFilesThanCache = Directory.GetFiles(path, "*", SearchOption.AllDirectories).Any(f => Path.GetFileNameWithoutExtension(f).Length != 40);
_cacheDirectoryIsValidPath = PathRegex().IsMatch(path); _cacheDirectoryIsValidPath = PathRegex().IsMatch(path);
if (!string.IsNullOrEmpty(path) if (!string.IsNullOrEmpty(path)