tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-23 13:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix an incoherent behaviour in Log Monitoring

Browse Source 
Quit Monitoring mode and close file (with user's permission) while
monitored file is deleted or renamed..
This commit is contained in:
Don HO 2016-05-12 23:59:10 +02:00
parent 4268349bf0
commit d9e62f1af6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PowerEditor/src/NppIO.cpp
View File

@ -57,7 +57,7 @@ DWORD WINAPI Notepad_plus::monitorFileOnChange(void * params)
//MessageBox(NULL, folderToMonitor, TEXT("folderToMonitor"), MB_OK);
const DWORD dwNotificationFlags = FILE_NOTIFY_CHANGE_LAST_WRITE;
const DWORD dwNotificationFlags = FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_FILE_NAME;
// Create the monitor and add directory to watch.
CReadDirectoryChanges changes;
@ -87,10 +87,18 @@ DWORD WINAPI Notepad_plus::monitorFileOnChange(void * params)
else
{
changes.Pop(dwAction, wstrFilename);
if (dwAction == FILE_ACTION_MODIFIED && lstrcmp(fullFileName, wstrFilename.GetString()) == 0)
if (lstrcmp(fullFileName, wstrFilename.GetString()) == 0)
{
::PostMessage(h, NPPM_INTERNAL_RELOADSCROLLTOEND, (WPARAM)buf, 0);
if (dwAction == FILE_ACTION_MODIFIED)
{
::PostMessage(h, NPPM_INTERNAL_RELOADSCROLLTOEND, (WPARAM)buf, 0);
}
else if ((dwAction == FILE_ACTION_REMOVED) || (dwAction == FILE_ACTION_RENAMED_OLD_NAME))
{
// File is deleted or renamed - quit monitoring thread and close file
::PostMessage(h, NPPM_MENUCOMMAND, 0, IDM_VIEW_MONITORING);
::PostMessage(h, NPPM_INTERNAL_CHECKDOCSTATUS, 0, 0);
}
}
}
}