I wanna die :)

CrackAndDie · Feb 28, 2024 · f2492ba · f2492ba
1 parent ab57db9
commit f2492ba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/Hypocrite.Core/Container/InstancePolicy/SingletonPolicy.cs b/Hypocrite.Core/Container/InstancePolicy/SingletonPolicy.cs
@@ -16,14 +16,15 @@ public override object CreateInstance(bool withInjections)
  OnInjectionDone();
 
  // all the injections should be resolved in the instance on its first resolve
- if (!_registration.MemberInjectionInfo.IsInjected && withInjections)
- {
- if (_registration.Instance != null)
- _lightContainer.InstanceCreator.ResolveInjections(_registration.Instance, _registration.MemberInjectionInfo);
- else
- _registration.Instance = _lightContainer.InstanceCreator.CreateInstance(_registration, withInjections);
+ bool reqInj = !_registration.MemberInjectionInfo.IsInjected && withInjections;
+ if (_registration.Instance != null && reqInj)
+ _lightContainer.InstanceCreator.ResolveInjections(_registration.Instance, _registration.MemberInjectionInfo);
+ else if (_registration.Instance == null)
+ _registration.Instance = _lightContainer.InstanceCreator.CreateInstance(_registration, reqInj);
+
+ if (reqInj)
  OnInjectionDone();
- }
+
  return _registration.Instance;
  }
 

diff --git a/Hypocrite.DemoAvalonia/Extensions/DialogExtensions.cs b/Hypocrite.DemoAvalonia/Extensions/DialogExtensions.cs
@@ -19,6 +19,7 @@ public static void ShowCustomDialog<DialogType>(this IDialogService dialogServic
  {
  if (Avalonia.Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
  {
+ var a = typeof(DialogType).Name;
  dialogService.ShowDialog(desktop.MainWindow, typeof(DialogType).Name, ParseParameters(parameters), r =>
  {
  if (r is DialogResult userResult)

diff --git a/Hypocrite.DemoWpf/App.xaml.cs b/Hypocrite.DemoWpf/App.xaml.cs
@@ -48,7 +48,6 @@ protected override Window CreateShell()
  var viewModelService = Container.Resolve<IViewModelResolverService>();
  viewModelService.RegisterViewModelAssembly(Assembly.GetExecutingAssembly());
 
-
  return base.CreateShell();
  }
 

diff --git a/Hypocrite.Wpf/MVVM/ApplicationBase.cs b/Hypocrite.Wpf/MVVM/ApplicationBase.cs
@@ -28,7 +28,8 @@ protected override Window CreateShell()
  {
  if (Container.IsRegistered<IPreviewWindow>())
  {
- Container.Resolve<IEventAggregator>().GetEvent<PreviewDoneEvent>().Subscribe(OnPreviewDone);
+ var ev = Container.Resolve<IEventAggregator>();
+ ev.GetEvent<PreviewDoneEvent>().Subscribe(OnPreviewDone);
  return Container.Resolve<IPreviewWindow>() as Window;
  }
  return Container.Resolve<IBaseWindow>() as Window;