diff --git a/Core/FileSystems/ISOFileSystem.cpp b/Core/FileSystems/ISOFileSystem.cpp index 2082472475..cfd30cb189 100644 --- a/Core/FileSystems/ISOFileSystem.cpp +++ b/Core/FileSystems/ISOFileSystem.cpp @@ -512,7 +512,7 @@ std::vector ISOFileSystem::GetDirListing(std::string path) { TreeEntry *e = entry->children[i]; - if(!strcmp(e->name, ".") || !strcmp(e->name, "..")) // do not include the relative entries in the list + if(!strcmp(e->name.c_str(), ".") || !strcmp(e->name.c_str(), "..")) // do not include the relative entries in the list continue; PSPFileInfo x; diff --git a/Core/HLE/sceImpose.cpp b/Core/HLE/sceImpose.cpp index d6b0a17182..12e9b18186 100644 --- a/Core/HLE/sceImpose.cpp +++ b/Core/HLE/sceImpose.cpp @@ -37,6 +37,7 @@ const HLEFunction sceImpose[] = {0x381bd9e7, 0, "sceImposeHomeButton"}, {0x24fd7bcf, 0, "sceImposeGetLanguageMode"}, {0x8c943191, &WrapU_UU, "sceImposeGetBatteryIconStatus"}, + {0x72189C48, 0, "sceImposeSetUMDPopup"}, }; void Register_sceImpose() diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index 4828943414..4c0135258c 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -529,7 +529,7 @@ void PSPSetTexture() match = false; //TODO: Check more clut parameters, compute clut hash - if(match && (format >= GE_TFMT_CLUT4 || format <= GE_TFMT_CLUT32) && + if(match && (format >= GE_TFMT_CLUT4 && format <= GE_TFMT_CLUT32) && (entry.clutformat != clutformat || entry.clutaddr != GetClutAddr(clutformat == GE_CMODE_32BIT_ABGR8888 ? 4 : 2) || entry.cluthash != Memory::Read_U32(entry.clutaddr))) @@ -568,7 +568,7 @@ void PSPSetTexture() entry.hash = *(u32*)texptr; entry.format = format; - if(format >= GE_TFMT_CLUT4 || format <= GE_TFMT_CLUT32) + if(format >= GE_TFMT_CLUT4 && format <= GE_TFMT_CLUT32) { entry.clutformat = clutformat; entry.clutaddr = GetClutAddr(clutformat == GE_CMODE_32BIT_ABGR8888 ? 4 : 2);