livecode
diff --git a/‎engine/src/object.cpp
Copy file name to clipboardExpand all lines: engine/src/object.cpp
+1-1Lines changed: 1 addition & 1 deletion b/‎engine/src/object.cpp
Copy file name to clipboardExpand all lines: engine/src/object.cpp
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/lcs/core/engine/_extension.lcb
Copy file name to clipboardExpand all lines: tests/lcs/core/engine/_extension.lcb
+13Lines changed: 13 additions & 0 deletions b/‎tests/lcs/core/engine/_extension.lcb
Copy file name to clipboardExpand all lines: tests/lcs/core/engine/_extension.lcb
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎tests/lcs/core/engine/extension.livecodescript
Copy file name to clipboardExpand all lines: tests/lcs/core/engine/extension.livecodescript
+29Lines changed: 29 additions & 0 deletions b/‎tests/lcs/core/engine/extension.livecodescript
Copy file name to clipboardExpand all lines: tests/lcs/core/engine/extension.livecodescript
+29Lines changed: 29 additions & 0 deletions
@@ -2431,7 +2431,7 @@ bool MCObject::getnameproperty(Properties which, uint32_t p_part_id, MCValueRef&
             //   but *only* for this control (continue with names the rest of the way).
             Properties t_which_requested;
             t_which_requested = which;
-            if (which == P_LONG_NAME && isunnamed())
+            if ((which == P_LONG_NAME || which == P_LONG_NAME_NO_FILENAME) && isunnamed())
                 which = P_LONG_ID;
             if (parent)
             {
 
@@ -1,5 +1,6 @@
 library com.livecode.lcs_tests.core.extension
 
+use com.livecode.engine
 use com.livecode.lcs_tests.core.extension.support
 
 public handler TestExtensionBridgeNames_ExecuteScript()
@@ -68,4 +69,16 @@ public handler TestExtensionLog_Array()
 	log {"a": 1}
 end handler
 
+public handler TestExtensionLog_ScriptObject()
+	resolve script object "button 1"
+	log the result
+end handler
+
+public handler TestExtensionLog_DeletedScriptObject()
+	variable tScriptObject as ScriptObject
+	resolve script object "button 1" into tScriptObject
+	execute script "delete button 1"
+	log tScriptObject
+end handler
+
 end library
@@ -241,3 +241,32 @@ on TestExtensionLogString
 	wait for 0 with messages
 	TestAssert "extension log string", sLastLog is quote & "log" & quote
 end TestExtensionLogString
+
+on TestExtensionLogScriptObject
+  // resolve script object "button 1"
+  // log the result
+  create button
+  get TestExtensionLog_ScriptObject()
+  wait for 0 with messages
+  TestDiagnostic sLastLog
+  TestAssert "extension log unnamed scriptobject", \
+              sLastLog is format("<script object button id %d of card id %d of stack %s>", \
+                                  the id of button 1, \
+                                  the id of this card, \
+                                  quote & the short name of this stack & quote)
+
+  set the name of button 1 to "foo"
+  get TestExtensionLog_ScriptObject()
+  wait for 0 with messages
+  TestDiagnostic sLastLog
+  TestAssert "extension log named scriptobject", \
+              sLastLog is format("<script object button %s of card id %d of stack %s>", \
+                                  quote & the short name of button 1 & quote, \
+                                  the id of this card, \
+                                  quote & the short name of this stack & quote)
+
+  get TestExtensionLog_DeletedScriptObject()
+  wait for 0 with messages
+  TestDiagnostic sLastLog
+  TestAssert "extension log deleted scriptobject", sLastLog is "<deleted script object>"
+end TestExtensionLogScriptObject