|
@@ -4,6 +4,7 @@ using NatTypeTester.ViewModels;
|
|
|
using ReactiveMarbles.ObservableEvents;
|
|
|
using ReactiveUI;
|
|
|
using System.Reactive.Disposables;
|
|
|
+using System.Reactive.Linq;
|
|
|
using Volo.Abp.DependencyInjection;
|
|
|
|
|
|
namespace NatTypeTester;
|
|
@@ -38,7 +39,7 @@ public partial class MainWindow : ISingletonDependency
|
|
|
{
|
|
|
if (parameter.args.IsSettingsSelected)
|
|
|
{
|
|
|
- ViewModel.Router.Navigate.Execute(serviceProvider.GetRequiredService<SettingViewModel>());
|
|
|
+ ViewModel.Router.Navigate.Execute(serviceProvider.GetRequiredService<SettingViewModel>()).Subscribe().Dispose();
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -51,12 +52,12 @@ public partial class MainWindow : ISingletonDependency
|
|
|
{
|
|
|
case @"1":
|
|
|
{
|
|
|
- ViewModel.Router.Navigate.Execute(serviceProvider.GetRequiredService<RFC5780ViewModel>());
|
|
|
+ ViewModel.Router.Navigate.Execute(serviceProvider.GetRequiredService<RFC5780ViewModel>()).Subscribe().Dispose();
|
|
|
break;
|
|
|
}
|
|
|
case @"2":
|
|
|
{
|
|
|
- ViewModel.Router.Navigate.Execute(serviceProvider.GetRequiredService<RFC3489ViewModel>());
|
|
|
+ ViewModel.Router.Navigate.Execute(serviceProvider.GetRequiredService<RFC3489ViewModel>()).Subscribe().Dispose();
|
|
|
break;
|
|
|
}
|
|
|
}
|