Merge pull request #6568 from montegoulding/drawingresourcepath

Monte Goulding · web-flow · commit 3f9855ca01f6 · 2018-06-08T15:40:35.000+10:00
[[ Drawing ]] Fallback to relative resource path
diff --git a/extensions/script-libraries/drawing/drawing.livecodescript b/extensions/script-libraries/drawing/drawing.livecodescript
@@ -3277,14 +3277,16 @@ end seqLast
  ******************************************************************************/
 
 private function _GetResourcesPath
-   if the environment begins with "development" then
+   local tResourcesFolder
+   -- in the mapping, tResourcesFolder begins with ./
+   try
+      put char 3 to -1 of revLibraryMapping[the short name of me & \
+         slash & "resources"] into tResourcesFolder
+   end try
+   if tResourcesFolder is empty then
       set the itemDelimiter to slash
       return item 1 to -2 of the filename of me & slash & "resources"
    else
-      local tResourcesFolder
-      -- in the mapping, tResourcesFolder begins with ./
-      put char 3 to -1 of revLibraryMapping[the short name of me  & slash & "resources"] \
-            into tResourcesFolder
       put specialFolderPath("resources") & slash before tResourcesFolder
       return tResourcesFolder
    end if
