Skip to content

Commit 5c3c6a8

Browse files
authored
Merge pull request #9386 from N-thony/minor_bug_output
Skipping enable disable undo script in the output window
2 parents 2eb584e + a0ad4d8 commit 5c3c6a8

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

instat/Model/DataFrame/clsDataFramePage.vb

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ Public Class clsDataFramePage
236236

237237
Dim strDisable As String = If(bDisable, "TRUE", "FALSE")
238238
clsEnableDisableUndoRFunction.AddParameter("disable_undo", strDisable)
239-
_clsRLink.RunScript(clsEnableDisableUndoRFunction.ToScript)
239+
_clsRLink.RunScript(clsEnableDisableUndoRFunction.ToScript, bSkipScriptAndOutput:=True)
240240

241241
End Sub
242242

instat/clsRLink.vb

+6-3
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,8 @@ Public Class RLink
926926
Optional bSeparateThread As Boolean = True,
927927
Optional bShowWaitDialogOverride As Nullable(Of Boolean) = Nothing,
928928
Optional bUpdateGrids As Boolean = True,
929-
Optional bSilent As Boolean = False)
929+
Optional bSilent As Boolean = False,
930+
Optional bSkipScriptAndOutput As Boolean = False)
930931

931932
'if there is no script to run then just ignore and exit sub
932933
If String.IsNullOrWhiteSpace(strScript) Then
@@ -999,8 +1000,10 @@ Public Class RLink
9991000
End If
10001001
End If
10011002

1002-
' If strOutput is empty or does not contain valid HTML files, add strOutput itself as an output
1003-
clsOutputLogger.AddOutput(strScriptWithComment, strOutput, bAsFile, bDisplayOutputInExternalViewer)
1003+
If Not bSkipScriptAndOutput Then
1004+
' If strOutput is empty or does not contain valid HTML files, add strOutput itself as an output
1005+
clsOutputLogger.AddOutput(strScriptWithComment, strOutput, bAsFile, bDisplayOutputInExternalViewer)
1006+
End If
10041007

10051008

10061009
Catch e As Exception

0 commit comments

Comments
 (0)