Merge branch 'rmcrackan:master' into master

This commit is contained in:
Mbucari 2022-06-21 20:17:27 -06:00 committed by GitHub
commit 0cb18f9e1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View File

@ -27,7 +27,7 @@ To make upgrades and reinstalls easier, Libation separates all of its responsibi
### Linux and Mac ### Linux and Mac
Although Libation only currently officially supports Windows, some users have had success with WINE. ([Linux](https://github.com/rmcrackan/Libation/issues/28#issuecomment-890594158), [OSX Crossover and WINE](https://github.com/rmcrackan/Libation/issues/150#issuecomment-1004918592)) Although Libation only currently officially supports Windows, some users have had success with WINE. ([Linux](https://github.com/rmcrackan/Libation/issues/28#issuecomment-890594158), [OSX Crossover and WINE](https://github.com/rmcrackan/Libation/issues/150#issuecomment-1004918592), [Linux and WINE](https://github.com/rmcrackan/Libation/issues/28#issuecomment-1161111014))
### Settings ### Settings

View File

@ -79,8 +79,13 @@ namespace FileManager
//Stop raising events //Stop raising events
fileSystemWatcher?.Dispose(); fileSystemWatcher?.Dispose();
//Calling CompleteAdding() will cause background scanner to terminate. try
directoryChangesEvents?.CompleteAdding(); {
//Calling CompleteAdding() will cause background scanner to terminate.
directoryChangesEvents?.CompleteAdding();
}
// if directoryChangesEvents is non-null and isDisposed, this exception is thrown. there's no other way to check >:(
catch (ObjectDisposedException) { }
//Wait for background scanner to terminate before reinitializing. //Wait for background scanner to terminate before reinitializing.
backgroundScanner?.Wait(); backgroundScanner?.Wait();