Completed requested changes

RPTools · Feb 21, 2025 · f67b6b5 · f67b6b5
1 parent 9baa1a7
commit f67b6b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/functions/MacroDialogFunctions.java b/src/main/java/net/rptools/maptool/client/functions/MacroDialogFunctions.java
@@ -76,9 +76,7 @@ public Object childEvaluate(
       Parser parser, VariableResolver resolver, String functionName, List<Object> parameters)
       throws ParserException {
     // Macros can not interact with internal frames/dialogs/overlays
-    if (parameters.size() > 0
-        && (HTMLFrameFactory.isInternalOnly(parameters.get(0).toString())
-            || parameters.get(0).toString().startsWith(AppConstants.INTERNAL_FRAME_PREFIX))) {
+    if (parameters.size() > 0 && HTMLFrameFactory.isInternalOnly(parameters.get(0).toString())) {
       throw new ParserException(
           I18N.getText("msg.error.frame.reservedName", parameters.get(0).toString()));
     }

diff --git a/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLOverlayPanel.java b/src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLOverlayPanel.java
@@ -264,9 +264,7 @@ public void showOverlay(String name, int zOrder, boolean locked, String html, Ob
                 overlayManager.setZOrder(zOrder);
                 overlays.add(overlayManager);
               }
-              if (locked != overlayManager.getLocked()) {
-                overlayManager.setLocked(locked);
-              }
+              overlayManager.setLocked(locked);
             }
 
           } else {