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

Fix a regression regarding b859303148

pull/3568/head
Don HO 2017-07-27 12:44:06 +02:00
parent 385746de01
commit afb3889ffb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PowerEditor/src/Notepad_plus.cpp
View File

@ -5248,7 +5248,8 @@ void Notepad_plus::notifyBufferActivated(BufferID bufid, int view)
_linkTriggered = true; _linkTriggered = true;
} }
void Notepad_plus::loadCommandlineParams(const TCHAR * commandLine, CmdLineParams * pCmdParams) { void Notepad_plus::loadCommandlineParams(const TCHAR * commandLine, CmdLineParams * pCmdParams)
{
if (!commandLine || ! pCmdParams) if (!commandLine || ! pCmdParams)
return; return;

10
PowerEditor/src/winmain.cpp
View File

@ -30,7 +30,7 @@
#include "Win32Exception.h" //Win32 exception #include "Win32Exception.h" //Win32 exception
#include "MiniDumper.h" //Write dump files #include "MiniDumper.h" //Write dump files
typedef std::vector<const TCHAR*> ParamVector; typedef std::vector<generic_string> ParamVector;
namespace namespace
@ -190,7 +190,7 @@ bool isInList(const TCHAR *token2Find, ParamVector & params)
for (size_t i = 0; i < nbItems; ++i) for (size_t i = 0; i < nbItems; ++i)
{ {
if (!lstrcmp(token2Find, params.at(i))) if (!lstrcmp(token2Find, params.at(i).c_str()))
{ {
params.erase(params.begin() + i); params.erase(params.begin() + i);
return true; return true;
@ -206,7 +206,7 @@ bool getParamVal(TCHAR c, ParamVector & params, generic_string & value)
for (size_t i = 0; i < nbItems; ++i) for (size_t i = 0; i < nbItems; ++i)
{ {
const TCHAR * token = params.at(i); const TCHAR * token = params.at(i).c_str();
if (token[0] == '-' && lstrlen(token) >= 2 && token[1] == c) { //dash, and enough chars if (token[0] == '-' && lstrlen(token) >= 2 && token[1] == c) { //dash, and enough chars
value = (token+2); value = (token+2);
params.erase(params.begin() + i); params.erase(params.begin() + i);
@ -223,7 +223,7 @@ bool getParamValFromString(const TCHAR *str, ParamVector & params, generic_strin
for (size_t i = 0; i < nbItems; ++i) for (size_t i = 0; i < nbItems; ++i)
{ {
const TCHAR * token = params.at(i); const TCHAR * token = params.at(i).c_str();
generic_string tokenStr = token; generic_string tokenStr = token;
size_t pos = tokenStr.find(str); size_t pos = tokenStr.find(str);
if (pos != generic_string::npos && pos == 0) if (pos != generic_string::npos && pos == 0)
@ -409,7 +409,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int)
for (size_t i = 0; i < nbFilesToOpen; ++i) for (size_t i = 0; i < nbFilesToOpen; ++i)
{ {
const TCHAR * currentFile = params.at(i); const TCHAR * currentFile = params.at(i).c_str();
if (currentFile[0]) if (currentFile[0])
{ {
//check if relative or full path. Relative paths dont have a colon for driveletter //check if relative or full path. Relative paths dont have a colon for driveletter