Browse Source

Fixed bug introduced in last revision that caused test failure.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5553 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Daniel Grunwald 16 years ago
parent
commit
146b73ea01
  1. 2
      src/Main/Base/Project/Src/Gui/AbstractViewContent.cs
  2. 3
      src/Tools/StressTest/StressTest/StressTest.csproj

2
src/Main/Base/Project/Src/Gui/AbstractViewContent.cs

@ -466,7 +466,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -466,7 +466,7 @@ namespace ICSharpCode.SharpDevelop.Gui
/// Gets if this view content is the active view content.
/// </summary>
protected bool IsActiveViewContent {
get { return WorkbenchSingleton.Workbench.ActiveViewContent == this; }
get { return WorkbenchSingleton.Workbench != null && WorkbenchSingleton.Workbench.ActiveViewContent == this; }
}
/// <summary>

3
src/Tools/StressTest/StressTest/StressTest.csproj

@ -98,6 +98,9 @@ @@ -98,6 +98,9 @@
<ItemGroup>
<Page Include="UserControl.xaml" />
</ItemGroup>
<ItemGroup>
<Content Include="ProfilingSessions\Session20100225_205054.sdps" />
</ItemGroup>
<PropertyGroup>
<StartArguments>/addindir:"$(MsBuildProjectDirectory)\$(OutputPath)"</StartArguments>
</PropertyGroup>

Loading…
Cancel
Save