Skip to content

Fix drives loading #701

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.

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
merged 8 commits into from
May 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 15 additions & 27 deletions Files/Filesystem/Drives.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
Expand Down Expand Up @@ -51,37 +51,25 @@ public DrivesManager()
});
}

private async void DeviceWatcher_EnumerationCompleted(DeviceWatcher sender, object args)
private void DeviceWatcher_EnumerationCompleted(DeviceWatcher sender, object args)
{
// Only update collection from UI-thread
try
if (App.sideBarItems.FirstOrDefault(x => x is HeaderTextItem && x.Text == ResourceController.GetTranslation("SidebarDrives")) == null)
{
App.sideBarItems.Add(new HeaderTextItem() { Text = ResourceController.GetTranslation("SidebarDrives") });
}
foreach (DriveItem drive in Drives)
{
await CoreApplication.MainView.Dispatcher.RunAsync(CoreDispatcherPriority.Low, () =>
if (!App.sideBarItems.Contains(drive))
{
if (App.sideBarItems.FirstOrDefault(x => x is HeaderTextItem && x.Text == ResourceController.GetTranslation("SidebarDrives")) == null)
{
App.sideBarItems.Add(new HeaderTextItem() { Text = ResourceController.GetTranslation("SidebarDrives") });
}
foreach (DriveItem drive in Drives)
{
if (!App.sideBarItems.Contains(drive))
{
App.sideBarItems.Add(drive);
}
}

foreach (INavigationControlItem item in App.sideBarItems.ToList())
{
if (item is DriveItem && !Drives.Contains(item))
{
App.sideBarItems.Remove(item);
}
}
});
App.sideBarItems.Add(drive);
}
}
catch (Exception)
foreach (INavigationControlItem item in App.sideBarItems.ToList())
{
// UI thread not created yet?
if (item is DriveItem && !Drives.Contains(item))
{
App.sideBarItems.Remove(item);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion Files/MultilingualResources/Files.es-ES.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -633,4 +633,4 @@
</group>
</body>
</file>
</xliff>
</xliff>