Merge remote-tracking branch 'origin/master'

# Conflicts:
#	DaSaSo.ViewModel/SewerPipeLinerViewModel.cs
This commit is contained in:
HuskyTeufel
2021-10-11 07:35:18 +02:00
30 changed files with 325 additions and 4040 deletions

View File

@@ -38,7 +38,7 @@ namespace DaSaSo.ViewModel
private string _clientname = "";
private string _projektname = "";
private string _buildingsitename = "";
private readonly RegistryKey? registry;
private RegistryKey? registry;
const string REGISTRYKEY = "HKEY_CURRENT_USER\\Software\\Cosysda\\DaSaSo";
public bool CanSelectProject { get => _actualProject.AktuellClient != null; }
public bool CanSelectBuildingSite { get => _actualProject.AktuellProjekt != null; }
@@ -177,7 +177,7 @@ namespace DaSaSo.ViewModel
private void InitRegistry()
{
Registry.CurrentUser.CreateSubKey("Software\\Cosysda\\DaSaSo");
registry = Registry.CurrentUser.CreateSubKey("Software\\Cosysda\\DaSaSo");
LadeRegistry();
}