Merge pull request #215 from TomMuehlegger/master

Minor fixes
dotnetprojects · Aug 27, 2024 · 8ad300f · 8ad300f
2 parents 4f7e58f + 7a60c72
commit 8ad300f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/LibNoDaveConnectionLibrary/DataTypes/Blocks/Step7V5/S7FunctionBlockRow.cs b/LibNoDaveConnectionLibrary/DataTypes/Blocks/Step7V5/S7FunctionBlockRow.cs
@@ -770,9 +770,13 @@ public string ToString(bool useSymbol, bool addSemicolonAfterCommand, bool useDa
                             }
                             else
                             {
-                                par = "\"" + sym.Symbol + "\"." + paras[1];
-                                if (hasBit)
-                                    par += "." + paras[2];
+                                if (sym != null)
+                                {
+                                    par = "\"" + sym.Symbol + "\"." + paras[1];
+
+                                    if (hasBit)
+                                        par += "." + paras[2];
+                                }
                             }
                         }
                         else

diff --git a/LibNoDaveConnectionLibrary/Projectfiles/Step7ProjectV5.cs b/LibNoDaveConnectionLibrary/Projectfiles/Step7ProjectV5.cs
@@ -1643,6 +1643,7 @@ private SymbolTable _GetSymTabForProject(S7ProgrammFolder myBlockFolder, bool sh
                     }
             }
 
+            var dbPath = tmpId2.ToString();
             //Look fro Symlist Name
             {
                 var dbfTbl = DBF.ParseDBF.ReadDBF(ProjectFolder + "YDBs" + _DirSeperator + "SYMLISTS.DBF", _ziphelper, _DirSeperator);
@@ -1653,20 +1654,21 @@ private SymbolTable _GetSymTabForProject(S7ProgrammFolder myBlockFolder, bool sh
                         if ((int)row["_ID"] == tmpId2)
                         {
                             retVal.Name = (string)row["_UName"];
+                            dbPath = (string)row["_DbPath"];
                             if ((bool)row["DELETED_FLAG"]) retVal.Name = "$$_" + retVal.Name;
                             break;
                         }
                     }
                 }
             }
 
-            if (string.IsNullOrEmpty(retVal.Name) && !File.Exists(ProjectFolder + "YDBs" + _DirSeperator + tmpId2.ToString() + _DirSeperator + "SYMLIST.DBF"))
+            if (string.IsNullOrEmpty(retVal.Name) && !File.Exists(ProjectFolder + "YDBs" + _DirSeperator + dbPath + _DirSeperator + "SYMLIST.DBF"))
                 return null;
 
             retVal.showDeleted = showDeleted;
             if (tmpId2 != 0)
-                retVal.Folder = ProjectFolder + "YDBs" + _DirSeperator + tmpId2.ToString() + _DirSeperator;
-            
+                retVal.Folder = ProjectFolder + "YDBs" + _DirSeperator + dbPath + _DirSeperator;
+
             return retVal;
         }