From 8b4350fee747708ffd376744ef5dc1e239a87ba6 Mon Sep 17 00:00:00 2001
From: iCatButler <i.am.catbutler@gmail.com>
Date: Wed, 30 Mar 2016 15:07:35 +0100
Subject: Bring up to date with PCSX-R master (97809)

---
 macosx/Source/PcsxrMemCardController.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'macosx/Source/PcsxrMemCardController.m')

diff --git a/macosx/Source/PcsxrMemCardController.m b/macosx/Source/PcsxrMemCardController.m
index 8f7bccd6..873303d8 100644
--- a/macosx/Source/PcsxrMemCardController.m
+++ b/macosx/Source/PcsxrMemCardController.m
@@ -115,7 +115,7 @@
 	
 	int cardSize, freeConsBlocks, availBlocks;
 	
-	if ([[fromCard memoryArray][selectedIndex] flag] == memFlagFree) {
+	if ([[fromCard memoryArray][selectedIndex] flag] == PCSXRMemFlagFree) {
 		NSBeep();
 		return;
 	}
@@ -193,7 +193,7 @@
 
 	PcsxrMemoryObject *tmpObj = [curCard memoryArray][selectedIndex];
 	
-	if (tmpObj.flag == memFlagFree) {
+	if (tmpObj.flag == PCSXRMemFlagFree) {
 		NSBeep();
 		return;
 	}
-- 
cgit v1.2.3