Egalware/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Icarus 3.1c2 :

Browse Source 
- correzione per crash dopo conferma edit materiali senza materiale corrente in top bar (progetto nuovo).
This commit is contained in:
Dario Sassi
2026-03-10 16:16:21 +01:00
parent 251ae061f1
commit 757c4d7b6f
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Icarus/MaterialDb/MaterialDbVM.vb
+11 -9
View File
@@ -283,17 +283,19 @@ Public Class MaterialDbVM
' aggiorno lista materiali Db
Init()
' aggiorno lista materiali TopBar
Dim PrevMaterialGuid As String = Map.refTopPanelVM.SelMaterial.sGUID
Map.refTopPanelVM.InitMaterialList()
Dim PrevMaterial As MaterialIndex = Map.refTopPanelVM.MaterialList.FirstOrDefault(Function(x) x.sGUID = PrevMaterialGuid)
If Not IsNothing(PrevMaterial) Then
Map.refTopPanelVM.SetSelMaterial(PrevMaterial)
Else
Map.refTopPanelVM.SelMaterial = Nothing
Map.refTopPanelVM.NotifyPropertyChanged(NameOf(Map.refTopPanelVM.SelMaterial))
If Not IsNothing(Map.refTopPanelVM.SelMaterial) Then
Dim PrevMaterialGuid As String = Map.refTopPanelVM.SelMaterial.sGUID
Dim PrevMaterial As MaterialIndex = Map.refTopPanelVM.MaterialList.FirstOrDefault(Function(x) x.sGUID = PrevMaterialGuid)
If Not IsNothing(PrevMaterial) Then
Map.refTopPanelVM.SetSelMaterial(PrevMaterial)
Else
Map.refTopPanelVM.SelMaterial = Nothing
Map.refTopPanelVM.NotifyPropertyChanged(NameOf(Map.refTopPanelVM.SelMaterial))
End If
' ricarico lavorazioni per aggiorno liste materiali all'interno
Map.refMachiningDbVM.Init()
End If
' ricarico lavorazioni per aggiorno liste materiali all'interno
Map.refMachiningDbVM.Init()
End If
' ripristino modalita' standard
Map.refTopPanelVM.SelPage = Pages.MODIFY
Icarus/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -70,5 +70,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.1.3.1")>
<Assembly: AssemblyFileVersion("3.1.3.1")>
<Assembly: AssemblyVersion("3.1.3.2")>
<Assembly: AssemblyFileVersion("3.1.3.2")>