Mercurial > silverbladetech

changeset 25:81f9b72a44ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tidy up
author adminsh@apollo
date Tue, 20 Mar 2012 21:22:00 +0000
parents a8b50a087544
children 045dac571339
files MetroWpf/MetroWpf.sln.DotSettings.user MetroWpf/MetroWpf/IoCModule.cs
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MetroWpf/MetroWpf.sln.DotSettings.user	Tue Mar 20 20:18:35 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/MergeOccurences/@EntryValue">False</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
--- a/MetroWpf/MetroWpf/IoCModule.cs	Tue Mar 20 20:18:35 2012 +0000
+++ b/MetroWpf/MetroWpf/IoCModule.cs	Tue Mar 20 21:22:00 2012 +0000
@@ -10,6 +10,7 @@
 using MetroWpf.UI.Login;
 using MetroWpf.UI.Settings;
 using MetroWpf.UI.Shell;
+using Microsoft.Practices.ServiceLocation;
 using Ninject.Modules;
 using Stocks.Common;
 using Stocks.Service;
@@ -39,6 +40,10 @@
 
             Bind<IWebClientShim>().To<WebClientShim>();
             Bind<IStocksService>().To<StocksService>();
+            
+            // force loading of ctor whilst in async code
+            ServiceLocator.Current.GetInstance<StocksService>();
+
             Bind<StocksViewModel>().ToSelf();
             Bind<StocksView>().ToSelf();