From 37c09949b39bc49ca1bb456a9baf0e81358d3cf7 Mon Sep 17 00:00:00 2001 From: zilmar Date: Fri, 4 Mar 2022 22:05:29 +1030 Subject: [PATCH] Fix Vs2015 compile issues (#2665) * fix vs2015 compile issue --- src/GLideNHQ/TxHiResNoCache.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/GLideNHQ/TxHiResNoCache.cpp b/src/GLideNHQ/TxHiResNoCache.cpp index 701c49da..ff04a9dc 100644 --- a/src/GLideNHQ/TxHiResNoCache.cpp +++ b/src/GLideNHQ/TxHiResNoCache.cpp @@ -10,7 +10,7 @@ TxHiResNoCache::TxHiResNoCache(int maxwidth, int options, const wchar_t *cachePath, const wchar_t *texPackPath, - const wchar_t *fullTexPath, + const wchar_t *fullTexPath, const wchar_t *ident, dispInfoFuncExt callback) : TxHiResLoader(maxwidth, maxheight, maxbpp, options) @@ -86,10 +86,13 @@ bool TxHiResNoCache::get(Checksum checksum, N64FormatSize n64FmtSz, GHQTexInfo * } return _loadedTex.end(); }; - if (auto loadedTexMap = findTex(checksum); loadedTexMap != _loadedTex.end()) { - DBG_INFO(80, wst("TxNoCache::get: cached chksum:%08X %08X found\n"), chksum, palchksum); - *info = loadedTexMap->second; - return true; + { + auto loadedTexMap = findTex(checksum); + if (loadedTexMap != _loadedTex.end()) { + DBG_INFO(80, wst("TxNoCache::get: cached chksum:%08X %08X found\n"), chksum, palchksum); + *info = loadedTexMap->second; + return true; + } } DBG_INFO(80, wst("TxNoCache::get: loading chksum:%08X %08X\n"), chksum, palchksum);