Fix empty message showing while cancelling session file saving dialog

Fix #14235, close #14237
This commit is contained in:
xomx 2023-10-16 13:17:27 +02:00 committed by Don Ho
parent 089f7d6935
commit bbbf3e8dfc

View File

@ -2486,7 +2486,7 @@ bool Notepad_plus::fileLoadSession(const TCHAR *fn)
const TCHAR * Notepad_plus::fileSaveSession(size_t nbFile, TCHAR ** fileNames, const TCHAR *sessionFile2save, bool includeFileBrowser) const TCHAR * Notepad_plus::fileSaveSession(size_t nbFile, TCHAR ** fileNames, const TCHAR *sessionFile2save, bool includeFileBrowser)
{ {
if (sessionFile2save) if (sessionFile2save && (lstrlen(sessionFile2save) > 0))
{ {
Session currentSession; Session currentSession;
if ((nbFile) && (fileNames)) if ((nbFile) && (fileNames))
@ -2538,7 +2538,10 @@ const TCHAR * Notepad_plus::fileSaveSession(size_t nbFile, TCHAR ** fileNames)
fDlg.setCheckbox(checkboxLabel.c_str(), isCheckboxActive); fDlg.setCheckbox(checkboxLabel.c_str(), isCheckboxActive);
generic_string sessionFileName = fDlg.doSaveDlg(); generic_string sessionFileName = fDlg.doSaveDlg();
if (!sessionFileName.empty())
return fileSaveSession(nbFile, fileNames, sessionFileName.c_str(), fDlg.getCheckboxState()); return fileSaveSession(nbFile, fileNames, sessionFileName.c_str(), fDlg.getCheckboxState());
return NULL;
} }