summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authornakeee <nakeee@gmail.com>2008-09-05 12:16:01 +0000
committernakeee <nakeee@gmail.com>2008-09-05 12:16:01 +0000
commitdc28cbec1cfe0beeab736746fc4d85dcb5702011 (patch)
tree93fde448519a5f01062eb8e57806a6bc5ca28acd /Source/Core
parent6edc2343037d0e5e185763cd709f584e83e06d75 (diff)
map renamed to icon
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@443 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/src/MemcardManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/src/MemcardManager.cpp b/Source/Core/DolphinWX/src/MemcardManager.cpp
index 84cfa89c75..f84dff9ed2 100644
--- a/Source/Core/DolphinWX/src/MemcardManager.cpp
+++ b/Source/Core/DolphinWX/src/MemcardManager.cpp
@@ -276,8 +276,8 @@ void CMemcardManager::ReloadMemcard(const char *fileName, int card)
}
}
- wxBitmap map = wxBitmapFromMemoryRGBA((u8*)pxdata,96,32);
- images[i*2+1] = list->Add(map);
+ wxBitmap icon = wxBitmapFromMemoryRGBA((u8*)pxdata,96,32);
+ images[i*2+1] = list->Add(icon);
}
}