more fixes

Global_Indexer/frmIndex.vb

@@ -30,19 +30,12 @@ Public Class frmIndex
     Private CancelAttempts As Integer = 0
     Private Property ViewerString As String
 
-    'Dim DocView
-    'Dim viewer_string As String
-
-    Public Shared Function Instance() As frmIndex
-        If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then
-            _Instance = New frmIndex
-        End If
-        _Instance.BringToFront()
-        _Instance.TopMost = True
-        _Instance.Focus()
-        Return _Instance
-    End Function
 #End Region
+
+    Public Sub DisposeViewer()
+        DocumentViewer1.Dispose()
+    End Sub
+
     '#Region "+++++ Allgemeine Funktionen ++++++"
     Sub ShowError(text As String)
         'lblerror.Visible = True
@@ -1359,6 +1352,19 @@ Public Class frmIndex
                     Else
                         e.Cancel = True
                     End If
+                Case Else
+                    Try
+                        INDEXING_ACTIVE = False
+
+                        DocumentViewer1.CloseDocument()
+                        DocumentViewer1.Done()
+                        ClassWindowLocation.SaveFormLocationSize(Me)
+                        My.Settings.Save()
+                    Catch ex As Exception
+                        LOGGER.Info(" - Unexpected error in Schliessen des Formulares - Fehler: " & vbNewLine & ex.Message)
+                        LOGGER.Error(ex.Message)
+                        MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Schliessen des Formulares:")
+                    End Try
             End Select
         End If
     End Sub
@@ -1454,8 +1460,12 @@ Public Class frmIndex
 
                 checkMultiindex.Checked = False
                 checkMultiindex.Visible = True
+
+                BarButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
             Else
                 checkMultiindex.Visible = False
+
+                BarButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
             End If
         Catch ex As Exception
             LOGGER.Info(" - Unexpected error in Öffnen des Formulares - Fehler: " & vbNewLine & ex.Message)
@@ -2629,11 +2639,8 @@ Public Class frmIndex
         CONFIG.Config.SplitterDistanceViewer = SplitContainer1.SplitterDistance
     End Sub
 
-    Private Sub frmIndex_Closed(sender As Object, e As EventArgs) Handles Me.Closed
-
-    End Sub
-
-    Private Sub frmIndex_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing
-
+    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+        CancelAttempts = 2
+        Close()
     End Sub
 End Class