From bbbf3e8dfc9ab1106f6a3e4fc00afc9629f0bd05 Mon Sep 17 00:00:00 2001 From: xomx Date: Mon, 16 Oct 2023 13:17:27 +0200 Subject: [PATCH] Fix empty message showing while cancelling session file saving dialog Fix #14235, close #14237 --- PowerEditor/src/NppIO.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp index 03542f6d1..af8361828 100644 --- a/PowerEditor/src/NppIO.cpp +++ b/PowerEditor/src/NppIO.cpp @@ -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) { - if (sessionFile2save) + if (sessionFile2save && (lstrlen(sessionFile2save) > 0)) { Session currentSession; if ((nbFile) && (fileNames)) @@ -2538,7 +2538,10 @@ const TCHAR * Notepad_plus::fileSaveSession(size_t nbFile, TCHAR ** fileNames) fDlg.setCheckbox(checkboxLabel.c_str(), isCheckboxActive); generic_string sessionFileName = fDlg.doSaveDlg(); - return fileSaveSession(nbFile, fileNames, sessionFileName.c_str(), fDlg.getCheckboxState()); + if (!sessionFileName.empty()) + return fileSaveSession(nbFile, fileNames, sessionFileName.c_str(), fDlg.getCheckboxState()); + + return NULL; }