diff options
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/Src/BannerLoader.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/WiiWad.cpp | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp index 6451c73670..2350896c9c 100644 --- a/Source/Core/DiscIO/Src/BannerLoader.cpp +++ b/Source/Core/DiscIO/Src/BannerLoader.cpp @@ -27,7 +27,9 @@ #include <Windows.h> #else #include <sys/param.h> +#ifndef ANDROID #include <iconv.h> +#endif #include <errno.h> #endif @@ -132,6 +134,9 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16 } } #else +#ifdef ANDROID + return false; +#else if (_src) { iconv_t conv_desc = iconv_open("UTF-8", "CP932"); @@ -194,6 +199,7 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16 iconv_close(conv_desc); } #endif +#endif return returnCode; } diff --git a/Source/Core/DiscIO/Src/WiiWad.cpp b/Source/Core/DiscIO/Src/WiiWad.cpp index 24e091f9f4..fa44108586 100644 --- a/Source/Core/DiscIO/Src/WiiWad.cpp +++ b/Source/Core/DiscIO/Src/WiiWad.cpp @@ -49,7 +49,8 @@ WiiWAD::WiiWAD(const std::string& _rName) if (pReader == NULL || File::IsDirectory(_rName)) { m_Valid = false; - return; + if(pReader) delete pReader; + return; } m_Valid = ParseWAD(*pReader); |