Merge pull request #4 from runrevpanos/merge_bugfix-14858

livecodesebastien · livecodesebastien · commit 2732621b4866 · 2015-03-23T08:05:10.000-07:00
Merge bugfix 14858
diff --git a/engine/src/mbliphonestore.mm b/engine/src/mbliphonestore.mm
@@ -244,7 +244,10 @@ void MCStoreGetPurchaseProperty(MCExecContext& ctxt, MCStringRef p_product_id, M
 	{
 		MCExecValue t_value;
         MCExecFetchProperty(ctxt, t_info, t_purchase, t_value);
-		MCExecTypeConvertAndReleaseAlways(ctxt, t_value . type, &t_value, kMCExecValueTypeStringRef, &r_property_value);
+        if (ctxt.HasError())
+            r_property_value = MCValueRetain(kMCEmptyString);
+        else
+            MCExecTypeConvertAndReleaseAlways(ctxt, t_value . type, &t_value, kMCExecValueTypeStringRef, &r_property_value);
         return;
     }
     
@@ -496,7 +499,7 @@ void MCPurchaseGetOriginalTransactionIdentifier(MCExecContext& ctxt, MCPurchase
 void MCPurchaseGetOriginalPurchaseDate(MCExecContext& ctxt, MCPurchase *p_purchase, integer_t& r_date)
 {
 	MCiOSPurchase *t_ios_data = (MCiOSPurchase*)p_purchase->platform_data;
-    \
+    
 	SKPaymentTransaction *t_transaction = nil;
 	SKPaymentTransaction *t_original_transaction = nil;
     t_transaction = t_ios_data->transaction;

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,10 @@ void MCStoreGetPurchaseProperty(MCExecContext& ctxt, MCStringRef p_product_id, M`
`244`	`244`	`{`
`245`	`245`	`MCExecValue t_value;`
`246`	`246`	`MCExecFetchProperty(ctxt, t_info, t_purchase, t_value);`
`247`		`- MCExecTypeConvertAndReleaseAlways(ctxt, t_value . type, &t_value, kMCExecValueTypeStringRef, &r_property_value);`
	`247`	`+ if (ctxt.HasError())`
	`248`	`+ r_property_value = MCValueRetain(kMCEmptyString);`
	`249`	`+ else`
	`250`	`+ MCExecTypeConvertAndReleaseAlways(ctxt, t_value . type, &t_value, kMCExecValueTypeStringRef, &r_property_value);`
`248`	`251`	`return;`
`249`	`252`	`}`
`250`	`253`
`@@ -496,7 +499,7 @@ void MCPurchaseGetOriginalTransactionIdentifier(MCExecContext& ctxt, MCPurchase`
`496`	`499`	`void MCPurchaseGetOriginalPurchaseDate(MCExecContext& ctxt, MCPurchase *p_purchase, integer_t& r_date)`
`497`	`500`	`{`
`498`	`501`	`MCiOSPurchase t_ios_data = (MCiOSPurchase)p_purchase->platform_data;`
`499`		`- \`
	`502`	`+`
`500`	`503`	`SKPaymentTransaction *t_transaction = nil;`
`501`	`504`	`SKPaymentTransaction *t_original_transaction = nil;`
`502`	`505`	`t_transaction = t_ios_data->transaction;`