Merge remote-tracking branch 'origin/develop-8.1' into merge-develop-8.1_30.05.17

livecodeali · livecodeali · commit d345ee8ca48c · 2017-05-31T10:44:26.000+01:00
diff --git a/docs/notes/bugfix-19730.md b/docs/notes/bugfix-19730.md
@@ -0,0 +1 @@
+# Fix resolution of relative paths of images in Mac standalones
diff --git a/engine/src/dskmac.cpp b/engine/src/dskmac.cpp
@@ -916,14 +916,25 @@ static bool MCS_apply_redirect(MCStringRef p_path, bool p_is_file, MCStringRef&
     
     // Construct the new path from the path after MacOS/ inside Resources/_macos.
     MCAutoStringRef t_new_path;
-    MCRange t_cmd_range, t_path_range;
-    t_cmd_range = MCRangeMake(0, t_engine_path_length - 6);
-    t_path_range = MCRangeMake(t_engine_path_length + 1, UINDEX_MAX);
-    
-    // AL-2014-09-19: Range argument to MCStringFormat is a pointer to an MCRange.
-    /* UNCHECKED */ MCStringFormat(&t_new_path, "%*@/Resources/_MacOS%*@", &t_cmd_range, MCcmd, &t_path_range, p_path);
-    
-    if (p_is_file && !MCS_file_exists_at_path(*t_new_path))
+	MCRange t_cmd_range = MCRangeMake(0, t_engine_path_length - 6);
+	uindex_t t_path_end = MCStringGetLength(p_path);
+	bool t_success = true;
+	
+	if (MCStringGetCodepointAtIndex(p_path, t_path_end) == '/')
+		t_path_end--;
+	
+	if (t_engine_path_length == t_path_end)
+	{
+		t_success = MCStringFormat(&t_new_path, "%*@/Resources/_MacOS", &t_cmd_range, MCcmd);
+	}
+	else
+	{
+	    MCRange t_path_range = MCRangeMakeMinMax(t_engine_path_length + 1, t_path_end);
+		// AL-2014-09-19: Range argument to MCStringFormat is a pointer to an MCRange.
+		t_success = MCStringFormat(&t_new_path, "%*@/Resources/_MacOS/%*@", &t_cmd_range, MCcmd, &t_path_range, p_path);
+	}
+	
+    if (!t_success || (p_is_file && !MCS_file_exists_at_path(*t_new_path)))
         return false;
 
     r_redirected = MCValueRetain(*t_new_path);
diff --git a/tests/lcs/core/files/files.livecodescript b/tests/lcs/core/files/files.livecodescript
@@ -127,8 +127,7 @@ on TestSpecialFolderPath
    put specialFolderPath("resources") into tResources
    if the platform is "macos" and the environment is "standalone" then
       // Standalone on Mac have their non-executable resource in a specific folder
-      set the itemDelimiter to slash
-      TestAssert "Resources folder on standalone Mac app in is  Resources/_MacOS", item -2 to -1 of tResources is "Resources/_MacOS"
+      TestAssert "Resources folder on standalone Mac app in is  Resources/_MacOS", tResources ends with "Resources/_MacOS"
    else if the environment is "mobile" then
       testAssert "Resources and Engine specialfolderPaths are the same on mobile", tResources is tEngine
    else

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix resolution of relative paths of images in Mac standalones`