Minor code refactoring for file watching.

zufuliu · Jan 16, 2025 · d9a007c · d9a007c
1 parent 5ee2d9a
commit d9a007c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/src/Edit.cpp b/src/Edit.cpp
@@ -6461,7 +6461,7 @@ static INT_PTR CALLBACK EditInsertTagDlgProc(HWND hwnd, UINT umsg, WPARAM wParam
 						if (*pwCur == L'>' && pwCur[-1] != L'/') {
 							wchIns[cchIns] = L' ';
 							wchIns[cchIns + 1] = L'\0';
-							if (cchIns > 3 && cchIns < 16 && (pLexCurrent->iLexer != SCLEX_XML)) {
+							if (cchIns > 3 && cchIns < 15 && (pLexCurrent->iLexer != SCLEX_XML)) {
 								char tag[16]; // HTML void tag except <p>
 #if NP2_USE_SSE2
 								const __m128i *mm = reinterpret_cast<const __m128i *>(wchIns);

diff --git a/src/Notepad4.cpp b/src/Notepad4.cpp
@@ -8134,9 +8134,9 @@ void InstallFileWatching(bool terminate) noexcept {
 		}
 	}
 
-	bRunningWatch = !terminate;
 	dwChangeNotifyTime = 0;
-	if (!terminate) {
+	bRunningWatch = !terminate;
+	if (bRunningWatch) {
 		// Install
 		SetTimer(nullptr, ID_WATCHTIMER, dwFileCheckInterval, WatchTimerProc);
 
@@ -8152,12 +8152,17 @@ void InstallFileWatching(bool terminate) noexcept {
 			memset(&fdCurFile, 0, sizeof(fdCurFile));
 		}
 
-		hChangeHandle = iFileWatchingMethod ? nullptr : FindFirstChangeNotification(tchDirectory, FALSE,
+		if (iFileWatchingMethod) {
+			hChangeHandle = FindFirstChangeNotification(tchDirectory, FALSE,
 						FILE_NOTIFY_CHANGE_FILE_NAME	| \
 						FILE_NOTIFY_CHANGE_DIR_NAME		| \
 						FILE_NOTIFY_CHANGE_ATTRIBUTES	| \
 						FILE_NOTIFY_CHANGE_SIZE			| \
 						FILE_NOTIFY_CHANGE_LAST_WRITE);
+			if (hChangeHandle == INVALID_HANDLE_VALUE) {
+				hChangeHandle = nullptr;
+			}
+		}
 	}
 }
 
@@ -8190,7 +8195,7 @@ static void CheckCurrentFileChangedOutsideApp() noexcept {
 			dwChangeNotifyTime = 0;
 			SendMessage(hwndMain, APPM_CHANGENOTIFY, 0, 0);
 		}
-	} else if (!iFileWatchingMethod) {
+	} else if (hChangeHandle) {
 		FindNextChangeNotification(hChangeHandle);
 	}
 }
@@ -8217,17 +8222,19 @@ void CALLBACK WatchTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTim
 			dwChangeNotifyTime = 0;
 			SendMessage(hwndMain, APPM_CHANGENOTIFY, 0, 0);
 		}
+		// Check Change Notification Handle
+		// TODO: notification not fired for continuously updated file
+		else if (hChangeHandle) {
+			if (WAIT_OBJECT_0 == WaitForSingleObject(hChangeHandle, 0)) {
+				CheckCurrentFileChangedOutsideApp();
+			}
+		}
 		// polling, not very efficient but useful for watching continuously updated file
-		else if (iFileWatchingMethod) {
+		else {
 			if (dwChangeNotifyTime == 0) {
 				CheckCurrentFileChangedOutsideApp();
 			}
 		}
-		// Check Change Notification Handle
-		// TODO: notification not fired for continuously updated file
-		else if (WAIT_OBJECT_0 == WaitForSingleObject(hChangeHandle, 0)) {
-			CheckCurrentFileChangedOutsideApp();
-		}
 	}
 }