Browse Source

Merge branch 'master' into avalonia-list-improvements

pull/2882/head
Dariusz Komosiński 7 years ago
committed by GitHub
parent
commit
0191aa226e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
  2. 2
      src/Windows/Avalonia.Win32/WindowsMountedVolumeInfoListener.cs

2
src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs

@ -255,7 +255,7 @@ namespace Avalonia.Dialogs
{ {
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{ {
infos = infos.Where(i => (i.Attributes & (FileAttributes.Hidden | FileAttributes.System)) != 0); infos = infos.Where(i => (i.Attributes & (FileAttributes.Hidden | FileAttributes.System)) == 0);
} }
else else
{ {

2
src/Windows/Avalonia.Win32/WindowsMountedVolumeInfoListener.cs

@ -11,7 +11,7 @@ namespace Avalonia.Win32
internal class WindowsMountedVolumeInfoListener : IDisposable internal class WindowsMountedVolumeInfoListener : IDisposable
{ {
private readonly CompositeDisposable _disposables; private readonly CompositeDisposable _disposables;
private readonly ObservableCollection<MountedVolumeInfo> _targetObs; private readonly ObservableCollection<MountedVolumeInfo> _targetObs = new ObservableCollection<MountedVolumeInfo>();
private bool _beenDisposed = false; private bool _beenDisposed = false;
private ObservableCollection<MountedVolumeInfo> mountedDrives; private ObservableCollection<MountedVolumeInfo> mountedDrives;

Loading…
Cancel
Save