Deadlock bugfix

Author: levitation

Program.cs

@@ -594,7 +594,7 @@ private static async Task OnRenamedAsync(IRenamedFileSystemEvent rfse, Cancellat
                         //NB! if file is renamed to cs~ or resx~ then that means there will be yet another write to same file, so lets skip this event here
                         if (!rfse.FileSystemInfo.FullName.EndsWith("~"))
                         {
-                            using (await Global.FileOperationLocks.LockAsync(rfse.FileSystemInfo.FullName, rfse.PreviousFileSystemInfo.FullName, context.Token))
+                            //using (await Global.FileOperationLocks.LockAsync(rfse.FileSystemInfo.FullName, rfse.PreviousFileSystemInfo.FullName, context.Token))  //comment-out: prevent deadlock
                             {
                                 await FileUpdated(rfse.FileSystemInfo.FullName, context);
                                 await FileDeleted(rfse.PreviousFileSystemInfo.FullName, context);

Synchronisation.cs

@@ -112,8 +112,8 @@ public void Dispose()
             //NB! in order to avoid deadlocks, always take the locks in deterministic order
             names.Sort(StringComparer.InvariantCultureIgnoreCase);
 
-            var releaser1 = await Global.FileOperationLocks.LockAsync(names[0], cancellationToken);
-            var releaser2 = name1 != name2 ? await Global.FileOperationLocks.LockAsync(names[1], cancellationToken) : null;
+            var releaser1 = await this.LockAsync(names[0], cancellationToken);
+            var releaser2 = name1 != name2 ? await this.LockAsync(names[1], cancellationToken) : null;
 
             return new MultiLockDictReleaser(releaser1, releaser2);
         }