Fix a couple of menu bugs; make sure empty strings are always THE empty string

runrevali · runrevali · commit 8cb200d2c006 · 2014-06-26T12:22:11.000+01:00
diff --git a/engine/src/desktop-ans.cpp b/engine/src/desktop-ans.cpp
@@ -48,7 +48,6 @@ int MCA_folder(MCStringRef p_title, MCStringRef p_prompt, MCStringRef p_initial,
 	MCAutoStringRef t_folder;
 	for(;;)
 	{
-        MCValueRelease(*t_folder);
 		t_result = MCPlatformEndFolderDialog(&t_folder);
 		if (t_result != kMCPlatformDialogResultContinue)
 			break;
@@ -57,9 +56,7 @@ int MCA_folder(MCStringRef p_title, MCStringRef p_prompt, MCStringRef p_initial,
 	}
 	
 	if (t_result == kMCPlatformDialogResultSuccess)
-		r_result = MCValueRetain(*t_folder);
-	else
-		r_result = MCValueRetain(kMCEmptyString);
+		r_value = MCValueRetain(*t_folder);
 	
 	return 0;
 }
diff --git a/engine/src/desktop-pasteboard.cpp b/engine/src/desktop-pasteboard.cpp
@@ -250,7 +250,6 @@ bool MCSystemPasteboard::Fetch(MCTransferType p_type, MCDataRef& r_data)
 	/* UNCHECKED */ MCDataCreateWithBytesAndRelease((byte_t*)t_in_data_bytes, t_in_data_byte_count, &t_in_data);
 	
 	MCAutoDataRef t_out_data;
-	t_out_data = nil;
 	switch(m_entries[t_entry] . flavor)
 	{
 		case kMCPlatformPasteboardFlavorUTF8:
diff --git a/engine/src/mac-dialog.mm b/engine/src/mac-dialog.mm
@@ -612,7 +612,7 @@ MCPlatformDialogResult MCPlatformEndFileDialog(MCPlatformFileDialogKind p_kind,
 		{
             /* UNCHECKED */ MCStringCreateWithCFString((CFStringRef)[s_dialog_nesting -> panel filename], r_paths);
 			if (t_accessory != nil && [t_accessory currentType] != nil)
-				/* UNCHECKED */ MCStringCreateWithCFString((CFStringRef)[t_accessory currentType], r_type);
+				r_type = MCValueRetain([t_accessory currentType]);
 			else
 				r_type = nil;
 		}
@@ -633,7 +633,7 @@ MCPlatformDialogResult MCPlatformEndFileDialog(MCPlatformFileDialogKind p_kind,
 				[t_alias release];
 			}
 			if (t_accessory != nil && [t_accessory currentType] != nil)
-				/* UNCHECKED */ MCStringCreateWithCFString((CFStringRef)[t_accessory currentType], r_type);
+				r_type = MCValueRetain([t_accessory currentType]);
 			else
 				r_type = nil;
 		}
diff --git a/engine/src/player.cpp b/engine/src/player.cpp
@@ -1478,6 +1478,7 @@ bool MCPlayer::getversion(MCStringRef& r_string)
 #ifdef FEATURE_PLATFORM_PLAYER
     extern void MCQTGetVersion(MCStringRef &r_version);
     MCQTGetVersion(r_string);
+    return true;
 #else
 #if defined(X11)
     
diff --git a/libfoundation/src/foundation-string.cpp b/libfoundation/src/foundation-string.cpp
@@ -4992,18 +4992,26 @@ static bool __MCStringCopyMutable(__MCString *self, __MCString*& r_new_string)
     __MCString *t_string;
 	t_string = nil;
 	
-    if (!__MCValueCreate(kMCValueTypeCodeString, t_string))
-        return false;
-    
-    t_string -> char_count = self -> char_count;
-    if (MCStringIsNative(self))
-        t_string -> native_chars = self -> native_chars;
+    if (self -> char_count == 0)
+    {
+        t_string = MCValueRetain(kMCEmptyString);
+        MCMemoryDeleteArray(self -> native_chars);
+    }
     else
     {
-        t_string -> chars = self -> chars;
-        t_string -> flags |= kMCStringFlagIsNotNative;
+        if (!__MCValueCreate(kMCValueTypeCodeString, t_string))
+            return false;
+        
+        t_string -> char_count = self -> char_count;
+        if (MCStringIsNative(self))
+            t_string -> native_chars = self -> native_chars;
+        else
+        {
+            t_string -> chars = self -> chars;
+            t_string -> flags |= kMCStringFlagIsNotNative;
+        }
+        t_string -> capacity = 0;
     }
-    t_string -> capacity = 0;
     
     self -> char_count = 0;
     self -> chars = nil;

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ int MCA_folder(MCStringRef p_title, MCStringRef p_prompt, MCStringRef p_initial,`
`48`	`48`	`MCAutoStringRef t_folder;`
`49`	`49`	`for(;;)`
`50`	`50`	`{`
`51`		`- MCValueRelease(*t_folder);`
`52`	`51`	`t_result = MCPlatformEndFolderDialog(&t_folder);`
`53`	`52`	`if (t_result != kMCPlatformDialogResultContinue)`
`54`	`53`	`break;`
`@@ -57,9 +56,7 @@ int MCA_folder(MCStringRef p_title, MCStringRef p_prompt, MCStringRef p_initial,`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`if (t_result == kMCPlatformDialogResultSuccess)`
`60`		`- r_result = MCValueRetain(*t_folder);`
`61`		`- else`
`62`		`- r_result = MCValueRetain(kMCEmptyString);`
	`59`	`+ r_value = MCValueRetain(*t_folder);`
`63`	`60`
`64`	`61`	`return 0;`
`65`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,6 @@ bool MCSystemPasteboard::Fetch(MCTransferType p_type, MCDataRef& r_data)`
`250`	`250`	`/* UNCHECKED / MCDataCreateWithBytesAndRelease((byte_t)t_in_data_bytes, t_in_data_byte_count, &t_in_data);`
`251`	`251`
`252`	`252`	`MCAutoDataRef t_out_data;`
`253`		`- t_out_data = nil;`
`254`	`253`	`switch(m_entries[t_entry] . flavor)`
`255`	`254`	`{`
`256`	`255`	`case kMCPlatformPasteboardFlavorUTF8:`
Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ MCPlatformDialogResult MCPlatformEndFileDialog(MCPlatformFileDialogKind p_kind,`
`612`	`612`	`{`
`613`	`613`	`/* UNCHECKED */ MCStringCreateWithCFString((CFStringRef)[s_dialog_nesting -> panel filename], r_paths);`
`614`	`614`	`if (t_accessory != nil && [t_accessory currentType] != nil)`
`615`		`- /* UNCHECKED */ MCStringCreateWithCFString((CFStringRef)[t_accessory currentType], r_type);`
	`615`	`+ r_type = MCValueRetain([t_accessory currentType]);`
`616`	`616`	`else`
`617`	`617`	`r_type = nil;`
`618`	`618`	`}`
`@@ -633,7 +633,7 @@ MCPlatformDialogResult MCPlatformEndFileDialog(MCPlatformFileDialogKind p_kind,`
`633`	`633`	`[t_alias release];`
`634`	`634`	`}`
`635`	`635`	`if (t_accessory != nil && [t_accessory currentType] != nil)`
`636`		`- /* UNCHECKED */ MCStringCreateWithCFString((CFStringRef)[t_accessory currentType], r_type);`
	`636`	`+ r_type = MCValueRetain([t_accessory currentType]);`
`637`	`637`	`else`
`638`	`638`	`r_type = nil;`
`639`	`639`	`}`