Commit e7761793 authored by Ghislain MARY's avatar Ghislain MARY

Add logos to MS2Tester package content.

parent a0e75631
......@@ -114,10 +114,18 @@
<None Include="MS2Tester_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<Content Include="Assets\SplashScreen.scale-200.png" />
<Content Include="Assets\Square150x150Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.scale-200.png" />
<Content Include="Assets\StoreLogo.scale-200.png" />
<Content Include="Assets\SplashScreen.scale-200.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Assets\Square150x150Logo.scale-200.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Assets\Square44x44Logo.scale-200.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Assets\StoreLogo.scale-200.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Properties\Default.rd.xml" />
<Content Include="Assets\Images\nowebcamCIF.jpg" />
<Content Include="Assets\Sounds\arpeggio_8000_mono.wav" />
......
......@@ -107,16 +107,6 @@ namespace MS2Tester
}
else
{
if (_videoSource != null)
{
_videoSource.Stop();
_videoSource = null;
}
if (_previewSource != null)
{
_previewSource.Stop();
_previewSource = null;
}
StopVideoStream();
}
}
......@@ -248,6 +238,16 @@ namespace MS2Tester
{
Debug.WriteLine("StopVideoStream: failure");
}
if (_videoSource != null)
{
_videoSource.Stop();
_videoSource = null;
}
if (_previewSource != null)
{
_previewSource.Stop();
_previewSource = null;
}
}
catch (Exception e)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment