Model state persistence

GenieFramework · Dec 11, 2024 · 5f5ceeb · 5f5ceeb
1 parent 281e2b2
commit 5f5ceeb
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/ReactiveTools.jl b/src/ReactiveTools.jl
@@ -514,15 +514,18 @@ macro init(args...)
 end
 
 function init_model(M::Type{<:ReactiveModel}, args...; context = nothing, kwargs...)
-  m = parentmodule(M)
+  m = __module__ = parentmodule(M)
 
   initfn = begin
-    if Stipple.use_model_storage() && $__module__ === Stipple
+    if Stipple.use_model_storage() && __module__ === Stipple
       Stipple.ModelStorage.Sessions.init_from_storage
-    elseif isdefined($__module__, :Stipple) && isdefined($__module__.Stipple, :ModelStorage) && isdefined($__module__.Stipple.ModelStorage, :Sessions) && isdefined($__module__.Stipple.ModelStorage.Sessions, :init_from_storage) && Stipple.use_model_storage()
-      $__module__.Stipple.ModelStorage.Sessions.init_from_storage
-    elseif isdefined($__module__, :init_from_storage) && Stipple.use_model_storage()
-      $__module__.init_from_storage
+    elseif isdefined(__module__, :Stipple) && isdefined(__module__.Stipple, :ModelStorage) &&
+      isdefined(__module__.Stipple.ModelStorage, :Sessions) &&
+        isdefined(__module__.Stipple.ModelStorage.Sessions, :init_from_storage) &&
+          Stipple.use_model_storage()
+      __module__.Stipple.ModelStorage.Sessions.init_from_storage
+    elseif isdefined(__module__, :init_from_storage) && Stipple.use_model_storage()
+      __module__.init_from_storage
     else
       Stipple.init
     end