Merge pull request #3920 from AlexSananka/MinorEditsonduplicates

Minor edits on duplicates and dlgname
IDEMSInternational · Sep 12, 2017 · b30139c · b30139c
2 parents 1e7dd59 + 77aa594
commit b30139c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/instat/dlgDuplicatesConstructed.vb b/instat/dlgDuplicatesConstructed.vb
@@ -176,7 +176,6 @@ Public Class dlgDuplicatesConstructed
             If Not ucrReceiverForSuccessiveValues.IsEmpty Then
                 clsSubsetCol.AddParameter("col_name", ucrReceiverForSuccessiveValues.GetVariableNames())
                 clsSubsetCol.AddParameter("data_name", Chr(34) & ucrSelectorDuplicateswithVariables.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34))
-                frmMain.clsRLink.RunInternalScriptGetValue(clsSubsetCol.ToScript)
                 clsStreakFunction.AddParameter("ignore", clsSubsetCol.ToScript & "[" & clsSubsetCol.ToScript & ucrInputConditions.GetText & Chr(34) & ucrInputOmitValues.GetText & Chr(34) & "]", iPosition:=2)
             Else
                 clsStreakFunction.AddParameter("ignore", "NULL")

diff --git a/instat/dlgName.vb b/instat/dlgName.vb
@@ -28,6 +28,8 @@ Public Class dlgName
         If bFirstLoad Then
             InitialiseDialog()
             bFirstLoad = False
+        Else
+            ReopenDialog()
         End If
         If bReset Then
             SetDefaults()
@@ -60,6 +62,10 @@ Public Class dlgName
         ucrInputVariableLabel.SetParameter(New RParameter("label", 3))
     End Sub
 
+    Private Sub ReopenDialog()
+        ucrSelectVariables.Reset()
+    End Sub
+
     Public Sub SetDefaults()
         clsDefaultRFunction = New RFunction
         ucrInputVariableLabel.Reset()