크레마 프로그램이 종료되는 현상 수정

NtreevSoft · Jul 24, 2018 · 7d9d448 · 7d9d448
2 parents d10f486 + b559c52
commit 7d9d448
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 9 deletions.
diff --git a/client/Ntreev.Crema.Client.Framework/DescriptorListItemBase.cs b/client/Ntreev.Crema.Client.Framework/DescriptorListItemBase.cs
@@ -73,6 +73,8 @@ protected virtual void OnDisposed(EventArgs e)
 
  private async void Descriptor_PropertyChanged(object sender, PropertyChangedEventArgs e)
  {
+ if (this.isDescriptorDisposed == true)
+ return;
  await this.notifier.RefreshAsync();
  this.NotifyOfPropertyChange(e.PropertyName);
  }

diff --git a/client/Ntreev.Crema.Client.Framework/DescriptorTreeItemBase.cs b/client/Ntreev.Crema.Client.Framework/DescriptorTreeItemBase.cs
@@ -63,7 +63,7 @@ protected override void OnDisposed(EventArgs e)
  private async void Descriptor_PropertyChanged(object sender, PropertyChangedEventArgs e)
  {
  if (this.isDescriptorDisposed == true)
- throw new NotImplementedException("this object was disposed.");
+ return;
  if (e.PropertyName == nameof(this.DisplayName) && this.Parent != null)
  {
  this.Parent.Items.Reposition(this);

diff --git a/client/Ntreev.Crema.Client.SmartSet/BrowserItems/ViewModels/TableSmartSetBrowserViewModel.cs b/client/Ntreev.Crema.Client.SmartSet/BrowserItems/ViewModels/TableSmartSetBrowserViewModel.cs
@@ -84,7 +84,7 @@ public override TreeViewItemViewModel CreateTreeViewItemViewModel(TreeViewItemVi
  {
  if (parent is BookmarkRootTreeViewItemViewModel || parent is BookmarkCategoryTreeViewItemViewModel)
  return new BookmarkTableTreeViewItemViewModel(this.authenticator, descriptor, this);
- return new TableTreeViewItemViewModel(this.authenticator, new TableDescriptor(this.authenticator, descriptor), this);
+ return new TableTreeViewItemViewModel(this.authenticator, new TableDescriptor(this.authenticator, descriptor, true, this), this);
  }
 
  return null;

diff --git a/client/Ntreev.Crema.Client.Users/PropertyItems/ViewModels/DomainsViewModel.cs b/client/Ntreev.Crema.Client.Users/PropertyItems/ViewModels/DomainsViewModel.cs
@@ -167,6 +167,8 @@ private void Domains_DomainCreated(object sender, DomainEventArgs e)
  if (sender is IDomainCollection domainCollection)
  {
  var domain = e.Domain;
+ if (domain.Dispatcher == null)
+ return;
  var viewModel = domain.Dispatcher.Invoke(() => new DomainTreeItemBase(this.authenticator, domain, true, this));
  this.Dispatcher.InvokeAsync(() =>
  {

diff --git a/client/Ntreev.Crema.Services/Data/TableTemplate.cs b/client/Ntreev.Crema.Services/Data/TableTemplate.cs
@@ -91,9 +91,12 @@ protected override void OnEndEdit(Authentication authentication, TableInfo table
  {
  this.Container.InvokeTableEndTemplateEdit(authentication, this.table);
  base.OnEndEdit(authentication, tableInfo);
- this.table.UpdateTemplate(tableInfo);
- this.table.UpdateTags(tableInfo.Tags);
- this.table.UpdateComment(tableInfo.Comment);
+ if (tableInfo != TableInfo.Empty)
+ {
+ this.table.UpdateTemplate(tableInfo);
+ this.table.UpdateTags(tableInfo.Tags);
+ this.table.UpdateComment(tableInfo.Comment);
+ }
  this.table.SetTableState(TableState.None);
 
  var items = EnumerableUtility.One(this.table).ToArray();

diff --git a/common/Ntreev.Crema.AssemblyInfo/AssemblyInfo.cs b/common/Ntreev.Crema.AssemblyInfo/AssemblyInfo.cs
@@ -9,5 +9,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("3.6")]
-[assembly: AssemblyFileVersion("3.6.18191.1802")]
-[assembly: AssemblyInformationalVersion("3.6.18191.1802")]
+[assembly: AssemblyFileVersion("3.6.18205.1720")]
+[assembly: AssemblyInformationalVersion("3.6.18205.1720")]
diff --git a/sub-modules/Ntreev.ModernUI.Framework b/sub-modules/Ntreev.ModernUI.Framework
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.6.18191.1802
+3.6.18205.1720