tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix an issue due to VS2015 compiling result (bug)

This commit is contained in:
Don HO 2017-01-16 21:52:52 +01:00
parent f49133a1dc
commit d923ece38d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PowerEditor/src/Parameters.cpp
View File

@ -1948,7 +1948,7 @@ bool NppParameters::getSessionFromXmlTree(TiXmlDocument *pSessionDoc, Session *p
TiXmlElement *actView = sessionRoot->ToElement(); TiXmlElement *actView = sessionRoot->ToElement();
size_t index; size_t index;
const TCHAR *str = actView->Attribute(TEXT("activeView"), (int *)&index); const TCHAR *str = actView->Attribute(TEXT("activeView"), reinterpret_cast<int *>(&index));
if (str) if (str)
{ {
(*ptrSession)._activeView = index; (*ptrSession)._activeView = index;
@ -1962,14 +1962,15 @@ bool NppParameters::getSessionFromXmlTree(TiXmlDocument *pSessionDoc, Session *p
{ {
if (viewRoots[k]) if (viewRoots[k])
{ {
size_t index2;
TiXmlElement *actIndex = viewRoots[k]->ToElement(); TiXmlElement *actIndex = viewRoots[k]->ToElement();
str = actIndex->Attribute(TEXT("activeIndex"), (int *)&index); str = actIndex->Attribute(TEXT("activeIndex"), reinterpret_cast<int *>(&index2));
if (str) if (str)
{ {
if (k == 0) if (k == 0)
(*ptrSession)._activeMainIndex = index; (*ptrSession)._activeMainIndex = index2;
else // k == 1 else // k == 1
(*ptrSession)._activeSubIndex = index; (*ptrSession)._activeSubIndex = index2;
} }
for (TiXmlNode *childNode = viewRoots[k]->FirstChildElement(TEXT("File")); for (TiXmlNode *childNode = viewRoots[k]->FirstChildElement(TEXT("File"));
childNode ; childNode ;