Skip to content

Commit

Permalink
[Release] Final changes for 2.18.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
RobertvanderHulst committed Oct 31, 2023
1 parent fbbecd4 commit 71db3b2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/Master.sln
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ EndProject
Project("{AA6C8D78-22FF-423A-9C7C-5F2393824E04}") = "XSharp.Core", "Runtime\XSharp.Core\XSharp.Core.xsproj", "{535DFF14-EFB7-43F5-A4E1-71C1C4280040}"
ProjectSection(ProjectDependencies) = postProject
{2175700A-1AAE-4204-A89A-054C5AB9A21A} = {2175700A-1AAE-4204-A89A-054C5AB9A21A}
{9D02E3F9-7157-46B7-9E97-F62010E4B3F2} = {9D02E3F9-7157-46B7-9E97-F62010E4B3F2}
EndProjectSection
EndProject
Project("{AA6C8D78-22FF-423A-9C7C-5F2393824E04}") = "XSharp.RT", "Runtime\XSharp.RT\XSharp.RT.xsproj", "{EF8D2BF2-E81A-479A-BA4F-294C4C348B66}"
Expand Down
3 changes: 1 addition & 2 deletions src/VisualStudio/XSharpCodeModelXs/Parser/ModelWalker.prg
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ BEGIN NAMESPACE XSharpModel
STATIC METHOD Suspend() AS VOID
ModelWalker.suspendLevel++
IF (_projects:Count > 0)
LOCAL project := NULL AS XProject
IF _projects:TryPeek(REF project)
IF _projects:TryPeek(OUT VAR _)
XSolution.SetStatusBarText("")
ENDIF
ENDIF
Expand Down
4 changes: 2 additions & 2 deletions src/VisualStudio/XSharpVoEditors/Designers/VOMenuEditor.prg
Original file line number Diff line number Diff line change
Expand Up @@ -1375,7 +1375,7 @@ PARTIAL CLASS VOMenuEditor INHERIT DesignerBase
LOCAL nMaxOriginalDefineValue := 0 AS INT
FOREACH oDesign AS DesignMenuItem IN aControls
LOCAL nOriginalDefineValue := 0 AS INT
Int32.TryParse(oDesign:GetProperty("OriginalDefineValue"):TextValue, REF nOriginalDefineValue)
Int32.TryParse(oDesign:GetProperty("OriginalDefineValue"):TextValue, OUT nOriginalDefineValue)
IF nOriginalDefineValue > nMaxOriginalDefineValue
nMaxOriginalDefineValue := nOriginalDefineValue
ENDIF
Expand Down Expand Up @@ -1414,7 +1414,7 @@ PARTIAL CLASS VOMenuEditor INHERIT DesignerBase
oDesign:GetProperty("MenuID"):Value := SELF:GetNewMenuID()
END IF*/
LOCAL nValueToUse := 0 AS INT
Int32.TryParse(oDesign:GetProperty("OriginalDefineValue"):TextValue, REF nValueToUse)
Int32.TryParse(oDesign:GetProperty("OriginalDefineValue"):TextValue, OUT nValueToUse)
IF nValueToUse == 0
nValueToUse := nId
nId ++
Expand Down

0 comments on commit 71db3b2

Please sign in to comment.