Batteryfile-Textbox will be filled after Dialog is closed.

VECTO/GUI/BatteryForm.vb

@@ -35,7 +35,11 @@ Public Class BatteryForm
 
     Private _contextMenuFiles As String()
 
-
+    Public ReadOnly Property BatteryFile As String
+        Get
+            Return _batteryFile
+        End Get
+    End Property
 
 
     'Before closing Editor: Check if file was changed and ask to save.
@@ -392,11 +396,15 @@ Public Class BatteryForm
 
     'Save and close
     Private Sub ButOK_Click(sender As Object, e As EventArgs) Handles ButOK.Click
-        If SaveOrSaveAs(False) Then Close()
+        If SaveOrSaveAs(False) Then
+            DialogResult = DialogResult.OK
+            Close()
+        End If
     End Sub
 
     'Close without saving (see FormClosing Event)
     Private Sub ButCancel_Click(sender As Object, e As EventArgs) Handles ButCancel.Click
+        DialogResult = DialogResult.Cancel
         Close()
     End Sub
 

VECTO/GUI/REESSPackDialog.vb

@@ -83,13 +83,9 @@ Public Class REESSPackDialog
             End If
         End If
 
-        If Not BatteryForm.Visible Then
-            BatteryForm.Show()
-        Else
-            If BatteryForm.WindowState = FormWindowState.Minimized Then BatteryForm.WindowState = FormWindowState.Normal
-            BatteryForm.BringToFront()
-        End If
-
+        if BatteryForm.ShowDialog() = DialogResult.OK then
+			tbBattery.Text = BatteryForm.BatteryFile
+        end if
         If Not Trim(f) = "" Then
             Try
                 BatteryForm.OpenBatteryFile(f)