From 1fbfa0b1ee84fcf27d0e85a166701125041e7ace Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Tue, 11 Feb 2020 15:55:55 +0100
Subject: [PATCH] Dont execute folderwatch functions when indexing is active

---
 Global_Indexer/ModuleCURRENT.vb | 1 +
 Global_Indexer/frmIndex.vb      | 4 ++++
 Global_Indexer/frmStart.vb      | 9 +++++++++
 3 files changed, 14 insertions(+)

diff --git a/Global_Indexer/ModuleCURRENT.vb b/Global_Indexer/ModuleCURRENT.vb
index a6e7484..ccc49b2 100644
--- a/Global_Indexer/ModuleCURRENT.vb
+++ b/Global_Indexer/ModuleCURRENT.vb
@@ -57,6 +57,7 @@ Module ModuleCURRENT
 
     Public CURRENT_HTML_DOC As String
 
+    Public INDEXING_ACTIVE As Boolean = False
     Public MULTIINDEXING_ACTIVE As Boolean = False
     Public ABORT_INDEXING As Boolean = False
 
diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb
index 795d4ca..02bb29c 100644
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -1250,6 +1250,8 @@ Public Class frmIndex
     End Sub
     Private Sub frmIndex_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
         Try
+            INDEXING_ACTIVE = False
+
             ' This prevents the thread issue when the form containing the viewer is opened via ShowDialog.
             DocumentViewer1.Done()
 
@@ -1265,6 +1267,8 @@ Public Class frmIndex
         ' Abbruchzähler zurücksetzen
         CancelAttempts = 0
 
+        INDEXING_ACTIVE = True
+
         Try
             CURRENT_ISATTACHMENT = False
             DropType = ClassDatabase.Execute_Scalar("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID, MyConnectionString, True)
diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb
index 7e396c2..946d616 100644
--- a/Global_Indexer/frmStart.vb
+++ b/Global_Indexer/frmStart.vb
@@ -633,6 +633,14 @@ Public Class frmStart
             End If
         Else
             Try
+                ' JenneJ, 11.02.2019:
+                ' Keine Folderwatch Dateien verarbeiten, wenn gerade Indexiert wird, 
+                ' dadurch würden die Globalen Variablen überschrieben
+                ' und in Folge die falschen Dateien Indexiert!
+                If INDEXING_ACTIVE Or MULTIINDEXING_ACTIVE Then
+                    Exit Sub
+                End If
+
                 If FW_started = True Or CONFIG.Config.FolderWatchScanStarted = True Then
                     'Prüfen ob alle Files abgearbeitet wurden
                     Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%|FW%' AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')"
@@ -780,4 +788,5 @@ Public Class frmStart
         End Try
 
     End Sub
+
 End Class
\ No newline at end of file