diff options
| author | therzok <marius.ungureanu@xamarin.com> | 2019-02-14 15:28:49 +0300 |
|---|---|---|
| committer | therzok <marius.ungureanu@xamarin.com> | 2019-02-14 15:28:49 +0300 |
| commit | 4cc5888183a7292b86825071ccf107208d5b7866 (patch) | |
| tree | 7f56963e6c381e16c4388c435b0db46cc48f1bcf /main/src/addins/MonoDevelop.UnitTesting | |
| parent | 49d9050bff9aceb4735acae54fee12fe2b0f3f78 (diff) | |
| parent | 5c50aaa0adf401054cdcb5eb03edcef9bb487037 (diff) | |
Merge remote-tracking branch 'origin/master' into release-8.0
Conflicts:
main/external/xwt
main/src/addins/MacPlatform/MacPlatform.csproj
main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj
main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/packages.config
main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
main/tests/MonoDevelop.Core.Tests/MonoDevelop.Core.Tests.csproj
main/tests/MonoDevelop.Core.Tests/packages.config
version-checks
Diffstat (limited to 'main/src/addins/MonoDevelop.UnitTesting')
| -rw-r--r-- | main/src/addins/MonoDevelop.UnitTesting/Services/SolutionFolderTestGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/SolutionFolderTestGroup.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/SolutionFolderTestGroup.cs index 5346301540..bcf3ebbe39 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Services/SolutionFolderTestGroup.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Services/SolutionFolderTestGroup.cs @@ -64,7 +64,7 @@ namespace MonoDevelop.UnitTesting public override void Dispose () { folder.NameChanged -= OnCombineRenamed; - if (folder.IsRoot) { + if (folder.IsRoot && folder.ParentSolution != null) { folder.ParentSolution.SolutionItemAdded -= OnEntryChanged; folder.ParentSolution.SolutionItemRemoved -= OnEntryChanged; } |