diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 612edab..eb215ef 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
WebDoorCreator - Egalware
- Version: 0.9.2403.0911
+ Version: 0.9.2403.1110
Release note:
-
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index b2e9b5d..a0cc888 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2403.0911
+0.9.2403.1110
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index f212fe5..721fe76 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 0.9.2403.0911
+ 0.9.2403.1110
http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip
http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html
false
diff --git a/WebDoorCreator.Data/DDF/Converter.cs b/WebDoorCreator.Data/DDF/Converter.cs
index e1f1e3a..e6f52ba 100644
--- a/WebDoorCreator.Data/DDF/Converter.cs
+++ b/WebDoorCreator.Data/DDF/Converter.cs
@@ -37,7 +37,7 @@ namespace WebDoorCreator.Data.DDF
{
string outDdf = "";
try
- {
+ {
DoorOpsDTO CurrentDoorOp = new DoorOpsDTO();
EdgesDto CurrentEdges = new EdgesDto();
SizeDto CurrentSize = new SizeDto();
@@ -46,10 +46,13 @@ namespace WebDoorCreator.Data.DDF
FinishingDto CurrentFinishing = new FinishingDto();
DDFDto CurrentConf = new DDFDto();
ListValuesModel CurrentCompoOrder = new ListValuesModel();
+ Dictionary>> dictDoorOP = new Dictionary>>();
+ Dictionary> dictBaseDoorOp = new Dictionary>();
+ Dictionary> dictBaseSwing = new Dictionary>();
// per prima cosa popolo gli oggetti di appoggio...
dictDoorOP = new Dictionary>>();
var i = 0;
- foreach (var item in listOp.Where(x=>x.ObjectId != "Size" && x.ObjectId != "Profiles" && x.ObjectId != "Swing" && x.ObjectId != "Properties" && x.ObjectId != "Finishing"))
+ foreach (var item in listOp.Where(x => x.ObjectId != "Size" && x.ObjectId != "Profiles" && x.ObjectId != "Swing" && x.ObjectId != "Properties" && x.ObjectId != "Finishing"))
{
var deserialized = JsonConvert.DeserializeObject>(item.JsoncActVal!);
if (deserialized != null)
@@ -122,7 +125,7 @@ namespace WebDoorCreator.Data.DDF
}
i++;
}
- CurrentSize.size = dictBaseDoorOp;
+ CurrentSize.size = dictBaseDoorOp;
string sizeSer = CurrentSize.GetSerialized(RemDoorOp);
//dictBaseDoorOp.Clear();
foreach (var item in listOp.Where(x => x.ObjectId == "Swing"))
@@ -148,9 +151,11 @@ namespace WebDoorCreator.Data.DDF
#region Protected Properties
+#if false
protected Dictionary>> dictDoorOP { get; set; } = new Dictionary>>();
protected Dictionary> dictBaseDoorOp { get; set; } = new Dictionary>();
- protected Dictionary> dictBaseSwing { get; set; } = new Dictionary>();
+ protected Dictionary> dictBaseSwing { get; set; } = new Dictionary>();
+#endif
protected List FootRows { get; set; } = new List();
protected string FormatVers { get; set; } = "0";
protected List HeadRows { get; set; } = new List();
diff --git a/WebDoorCreator.Data/DTO/EdgesDto.cs b/WebDoorCreator.Data/DTO/EdgesDto.cs
index f828403..cff0e95 100644
--- a/WebDoorCreator.Data/DTO/EdgesDto.cs
+++ b/WebDoorCreator.Data/DTO/EdgesDto.cs
@@ -35,7 +35,6 @@ namespace WebDoorCreator.Data.DTO
}
if (item.Contains("Separator"))
{
- //sb.Remove(item);
sb.AppendLine(" ");
}
}
diff --git a/WebDoorCreator.Data/Services/QueueDataService.cs b/WebDoorCreator.Data/Services/QueueDataService.cs
index 7d151d3..4efdf73 100644
--- a/WebDoorCreator.Data/Services/QueueDataService.cs
+++ b/WebDoorCreator.Data/Services/QueueDataService.cs
@@ -1275,7 +1275,7 @@ namespace WebDoorCreator.Data.Services
int currVers = 0;
string sCurrVers = "";
// per prima cosa controllo se ho GIA' in coda qualcosa come richieste
- if (string.IsNullOrEmpty(sCurrVers) && await NumRequestPending() > 0)
+ if (await NumRequestPending() > 0)
{
var currPending = await RequestPending();
if (currPending != null)
diff --git a/WebDoorCreator.UI/WebDoorCreator.UI.csproj b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
index 67f84b5..2333801 100644
--- a/WebDoorCreator.UI/WebDoorCreator.UI.csproj
+++ b/WebDoorCreator.UI/WebDoorCreator.UI.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 0.9.2403.0911
+ 0.9.2403.1110
enable
aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608