From 5107637e7e88b01da0c5a0edd853b48b929c28b8 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 31 Mar 2007 09:21:51 +0000 Subject: [PATCH] fixed access violation in case m_vItems[i]->szClass is an int resource git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5014 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/DialogTemplate.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/DialogTemplate.cpp b/Source/DialogTemplate.cpp index 8db46713..726f87a5 100644 --- a/Source/DialogTemplate.cpp +++ b/Source/DialogTemplate.cpp @@ -435,8 +435,12 @@ void CDialogTemplate::CTrimToString(WORD id, char *str, int margins) { void CDialogTemplate::ConvertToRTL() { for (unsigned int i = 0; i < m_vItems.size(); i++) { bool addExStyle = false; - - char *szClass = winchar_toansi(m_vItems[i]->szClass); + char *szClass; + + if (IS_INTRESOURCE(m_vItems[i]->szClass)) + szClass = (char *) m_vItems[i]->szClass; + else + szClass = winchar_toansi(m_vItems[i]->szClass); // Button if (long(m_vItems[i]->szClass) == 0x80) {