From 6890e9495251ebe7088c3fdf18aa0c9952cc4d2a Mon Sep 17 00:00:00 2001 From: SinghRajenM Date: Sat, 3 Mar 2018 13:16:44 +0530 Subject: [PATCH] Fixed a code in ReadDirectoryChangesPrivate.cpp Close #4257 --- PowerEditor/src/NppIO.cpp | 4 ++-- .../ReadDirectoryChanges/ReadDirectoryChangesPrivate.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp index 755469fae..01aedcf45 100644 --- a/PowerEditor/src/NppIO.cpp +++ b/PowerEditor/src/NppIO.cpp @@ -77,12 +77,12 @@ DWORD WINAPI Notepad_plus::monitorFileOnChange(void * params) case WAIT_OBJECT_0 + 1: // We've received a notification in the queue. { - DWORD dwAction; - CStringW wstrFilename; if (changes.CheckOverflow()) printStr(L"Queue overflowed."); else { + DWORD dwAction; + CStringW wstrFilename; changes.Pop(dwAction, wstrFilename); generic_string fn = wstrFilename.GetString(); diff --git a/PowerEditor/src/WinControls/ReadDirectoryChanges/ReadDirectoryChangesPrivate.cpp b/PowerEditor/src/WinControls/ReadDirectoryChanges/ReadDirectoryChangesPrivate.cpp index 5f9cd4e54..f2d648a15 100644 --- a/PowerEditor/src/WinControls/ReadDirectoryChanges/ReadDirectoryChangesPrivate.cpp +++ b/PowerEditor/src/WinControls/ReadDirectoryChanges/ReadDirectoryChangesPrivate.cpp @@ -149,7 +149,7 @@ void CReadChangesRequest::ProcessNotification() CStringW wstrFilename(fni.FileName, fni.FileNameLength/sizeof(wchar_t)); // Handle a trailing backslash, such as for a root directory. - if (wstrFilename.Right(1) != L"\\") + if (m_wstrDirectory.Right(1) != L"\\") wstrFilename = m_wstrDirectory + L"\\" + wstrFilename; else wstrFilename = m_wstrDirectory + wstrFilename;