Skip to content

fix: allow s7p file on root level #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jogibear9988 merged 4 commits into from
Mar 6, 2026
Merged

fix: allow s7p file on root level #248

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
427edc7
add local test branch for easy testing
TomMuehlegger Mar 6, 2026
97b6737
fix: project handling if project file is under root level
TomMuehlegger Mar 6, 2026
a327ca6
fix: handling of protected blocks
TomMuehlegger Mar 6, 2026
aaac326
remove test project
TomMuehlegger Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion LibNoDaveConnectionLibrary/Projectfiles/Step7ProjectV5.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,13 @@ public Step7ProjectV5(string projectfile, bool showDeleted, Encoding prEn)
}

ProjectFile = projectfile;
ProjectFolder = _projectfilename.Substring(0, _projectfilename.LastIndexOf(_DirSeperator)) + _DirSeperator;
ProjectFolder = "";

// Check if the s7p file is at the root level (so no / in the path) or in a subfolder and set the ProjectFolder accordingly
if (_projectfilename.IndexOf(_DirSeperator) != -1)
{
ProjectFolder = _projectfilename.Substring(0, _projectfilename.LastIndexOf(_DirSeperator)) + _DirSeperator;
}

ProjectEncoding = (prEn ?? Encoding.GetEncoding("ISO-8859-1"));
var lngFile = _ziphelper.GetReadStream(ProjectFolder + "Global" + _DirSeperator + "Language");
Expand Down
Loading