Fix for Rhino 7

mcneel · Dec 18, 2024 · 9dbb7cd · 9dbb7cd
1 parent c8f4fe4
commit 9dbb7cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/RhinoInside.Revit.AddIn/Commands/Grasshopper/GrasshopperPlayerCommand.cs b/src/RhinoInside.Revit.AddIn/Commands/Grasshopper/GrasshopperPlayerCommand.cs
@@ -371,7 +371,7 @@ private struct RunInCommandContextGuard : IDisposable
       public RunInCommandContextGuard(GH_Document document)
       {
         Document = document;
-        RhinoDocument = document.RhinoDocument;
+        RhinoDocument = document.RhinoDocument();
         DocumentWasModified = document.IsModified;
         DocumentWasEnabled = document.Enabled;
         SolverWasEnabled = GH_Document.EnableSolutions;
@@ -403,7 +403,7 @@ ref string message
     )
     {
       if (definition is null) return Result.Failed;
-      if (definition.RhinoDocument is object && !definition.RhinoDocument.Equals(RhinoDoc.ActiveDoc)) return Result.Failed;
+      if (definition.RhinoDocument() is RhinoDoc rhinoDocument && rhinoDocument != RhinoDoc.ActiveDoc) return Result.Failed;
 
       try
       {

diff --git a/src/RhinoInside.Revit.External/Extensions/Grasshopper.cs b/src/RhinoInside.Revit.External/Extensions/Grasshopper.cs
@@ -10,6 +10,15 @@ public static bool KeepOpen(this GH_Document document)
       return document.Properties.KeepOpen;
 #else
       return false;
+#endif
+    }
+
+    public static Rhino.RhinoDoc RhinoDocument(this GH_Document document)
+    {
+#if RHINO_8
+      return document.RhinoDocument;
+#else
+      return Rhino.RhinoDoc.ActiveDoc;
 #endif
     }
   }