Index: Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerViewInfo.cs
===================================================================
diff -u -r15d39e3773620fe0e9c23de9831e16e6cc105d01 -rc7ac0719acf1ba7f05cfaeb13eacba48007abd39
--- Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerViewInfo.cs	(.../RiskeerViewInfo.cs)	(revision 15d39e3773620fe0e9c23de9831e16e6cc105d01)
+++ Riskeer/Common/src/Riskeer.Common.Plugin/RiskeerViewInfo.cs	(.../RiskeerViewInfo.cs)	(revision c7ac0719acf1ba7f05cfaeb13eacba48007abd39)
@@ -33,17 +33,17 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="RiskeerViewInfo{TData, TViewData, TView}"/> class.
         /// </summary>
-        /// <param name="gui">The <see cref="IGui"/> to use during the initialization.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <see cref="IGui"/> equals <c>null</c>.</exception>
-        public RiskeerViewInfo(IGui gui)
+        /// <param name="getGuiFunc">The function for retrieving the <see cref="IGui"/>.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <see cref="getGuiFunc"/> equals <c>null</c>.</exception>
+        public RiskeerViewInfo(Func<IGui> getGuiFunc)
         {
-            if (gui == null)
+            if (getGuiFunc == null)
             {
-                throw new ArgumentNullException(nameof(gui));
+                throw new ArgumentNullException(nameof(getGuiFunc));
             }
 
-            Symbol = gui.ActiveStateInfo?.Symbol;
-            FontFamily = gui.ActiveStateInfo?.FontFamily;
+            Symbol = getGuiFunc()?.ActiveStateInfo?.Symbol;
+            FontFamily = getGuiFunc()?.ActiveStateInfo?.FontFamily;
         }
     }
 
@@ -55,8 +55,8 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="RiskeerViewInfo{TData, TView}"/> class.
         /// </summary>
-        /// <param name="gui">The <see cref="IGui"/> to use during the initialization.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <see cref="IGui"/> equals <c>null</c>.</exception>
-        public RiskeerViewInfo(IGui gui) : base(gui) {}
+        /// <param name="getGuiFunc">The function for retrieving the <see cref="IGui"/>.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <see cref="getGuiFunc"/> equals <c>null</c>.</exception>
+        public RiskeerViewInfo(Func<IGui> getGuiFunc) : base(getGuiFunc) {}
     }
 }
\ No newline at end of file