Version 2.4.2.6

Global_Indexer/ClassFilehandle.vb

@@ -29,11 +29,8 @@ Public Class ClassFilehandle
                     oResult = MessageBox.Show(oMessage, oTitle, MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly)
 
                     If oResult = MsgBoxResult.Yes Then
-                        If pHandletype.StartsWith("|FW") Then
-                            Return Save_EmailAndAttachmentsToDisk(pFilename, True)
-                        Else
-                            Return Save_EmailAndAttachmentsToDisk(pFilename)
-                        End If
+                        Dim oIsFolderWatch = pHandletype.StartsWith("|FW")
+                        Return Save_EmailAndAttachmentsToDisk(pFilename, oIsFolderWatch)
                     End If
                 End If
             End If

Global_Indexer/My Project/AssemblyInfo.vb

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.2.3")>
+<Assembly: AssemblyVersion("2.4.2.6")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

Global_Indexer/frmIndex.vb

@@ -2705,8 +2705,6 @@ Public Class frmIndex
         ClearError()
         ClearNotice()
 
-
-
         Me.Cursor = Cursors.WaitCursor
         ClassHelper.Refresh_RegexTable()
         For Each rowregex As DataRow In CURRENT_DT_REGEX.Rows
@@ -2740,8 +2738,6 @@ Public Class frmIndex
                             MsgBox("All files were successfully processed through Multiindexing", MsgBoxStyle.Information, "Success")
                         End If
 
-                        'DTACTUAL_FILES.Clear()
-
                         DocumentViewer1.CloseDocument()
                         DocumentViewer1.Done()
 
@@ -2761,8 +2757,6 @@ Public Class frmIndex
                     End If
                 End If
 
-                EMAIL.Clear_TempFiles()
-
                 DocumentViewer1.CloseDocument()
                 DocumentViewer1.Done()
 
@@ -2770,9 +2764,25 @@ Public Class frmIndex
                 Me.Close()
             End If
         End If
+
+        ' Clear all temp files after indexing
+        Clear_Tempfiles()
+        EMAIL.Clear_TempFiles()
+
         Me.Cursor = Cursors.Default
     End Sub
 
+    Private Sub Clear_Tempfiles()
+        'TempDateien löschen
+        For Each oFile In TEMP_FILES
+            Try
+                System.IO.File.Delete(oFile)
+            Catch ex As Exception
+                LOGGER.Error(ex)
+            End Try
+        Next
+    End Sub
+
     Private Sub checkItemPreview_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkItemPreview.CheckedChanged
         SetFilePreview(checkItemPreview.Checked)
         CONFIG.Config.FilePreview = checkItemPreview.Checked

Global_Indexer/frmStart.vb

@@ -254,6 +254,8 @@ Public Class frmStart
             MsgBox("Unexpected Error in Closing Application: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
 
+        EMAIL.Clear_TempFiles()
+
         'TempDateien löschen
         For Each oFile In TEMP_FILES
             Try