Fix issue when getting the domain of a folder

Sometimes the folder is stored with a trailing slash. This case
has to be checked when getting the domain of a folder.

1 files changed, 10 insertions, 4 deletions

diff --git a/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs b/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
index 8708a21..3201c0e 100644
--- a/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
+++ b/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
@@ -1470,11 +1470,17 @@ namespace Mono.Addins.Database
 		public string GetFolderDomain (IProgressStatus progressStatus, string path)
 		{
 			AddinScanFolderInfo folderInfo;
-			if (GetFolderInfoForPath (progressStatus, path, out folderInfo) && folderInfo != null && !folderInfo.SharedFolder)
+
+			if (GetFolderInfoForPath (progressStatus, path, out folderInfo) && folderInfo == null) {
+				if (path.Length > 0 && path [path.Length - 1] != Path.DirectorySeparatorChar)
+					// Try again by appending a directory separator at the end. Some directories are registered like this.
+					GetFolderInfoForPath (progressStatus, path + Path.DirectorySeparatorChar, out folderInfo);
+				else if (path.Length > 0 && path [path.Length - 1] == Path.DirectorySeparatorChar)
+					// Try again by removing the directory separator at the end. Some directories are registered like this.
+					GetFolderInfoForPath (progressStatus, path.TrimEnd (Path.DirectorySeparatorChar), out folderInfo);
+			}
+			if (folderInfo != null && !string.IsNullOrEmpty (folderInfo.Domain))
 				return folderInfo.Domain;
-			else if (path.Length > 0 && path [path.Length - 1] != Path.DirectorySeparatorChar)
-				// Try again by appending a directory separator at the end. Some directories are registered like this.
-				return GetFolderDomain (progressStatus, path + Path.DirectorySeparatorChar);
 			else
 				return UnknownDomain;
 		}