Merge pull request #1979 from dannyparsons/dialogopen

fixed dialogs crashing with no data frame and changed position of data frame control
IDEMSInternational · Oct 30, 2016 · 1c550c2 · 1c550c2
2 parents 3118edd + f127766
commit 1c550c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb
@@ -92,7 +92,9 @@ Public Class RLink
 
         clsGetDataNames.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_names")
         chrDataFrameNames = RunInternalScriptGetValue(clsGetDataNames.ToScript()).AsCharacter
-        lstDataFrameNames.AddRange(chrDataFrameNames)
+        If chrDataFrameNames IsNot Nothing Then
+            lstDataFrameNames.AddRange(chrDataFrameNames)
+        End If
         Return lstDataFrameNames
     End Function
 
@@ -593,7 +595,7 @@ Public Class RLink
             clsGetModelNames.AddParameter("data_name", Chr(34) & strDataFrameName & Chr(34))
         End If
         expModelNames = RunInternalScriptGetValue(clsGetModelNames.ToScript(), bSilent:=True)
-        If Not expModelNames.Type = Internals.SymbolicExpressionType.Null Then
+        If expModelNames IsNot Nothing AndAlso (Not expModelNames.Type = Internals.SymbolicExpressionType.Null) Then
             chrModelNames = expModelNames.AsCharacter()
             If chrModelNames.Length > 0 Then
                 lstModelNames.AddRange(chrModelNames)

diff --git a/instat/ucrDataFrame.Designer.vb b/instat/ucrDataFrame.Designer.vb