Index: trunk/TruckExpoCDN/ExportForm.cs
===================================================================
--- trunk/TruckExpoCDN/ExportForm.cs (revision 482)
+++ trunk/TruckExpoCDN/ExportForm.cs (revision 834)
@@ -16,5 +16,5 @@
         KLIENCITableAdapter klientAdapter = new KLIENCITableAdapter();
         FAKTURA_DETAILSTableAdapter fakturyDetailsAdapter = new FAKTURA_DETAILSTableAdapter();
-        
+
         KontrahenciTableAdapter kontrahenciAdapter = new KontrahenciTableAdapter();
         TraElemTableAdapter TraElemAdapter = new TraElemTableAdapter();
@@ -26,5 +26,5 @@
 
         int nMaxProgress;
-        
+
         public ExportForm()
         {
@@ -48,8 +48,8 @@
         private void ExportForm_Load(object sender, EventArgs e)
         {
-            refresh();
-        }
-
-        private void refresh()
+            RefreshView();
+        }
+
+        private void RefreshView()
         {
             fAKTURYTableAdapter.FillByNotExported(eXPODataSet.FAKTURY);
@@ -58,5 +58,5 @@
 
             nMaxProgress = eXPODataSet.FAKTURY.Count;
-            
+
             toolStripProgressBar1.Value = 0;
         }
@@ -66,5 +66,5 @@
             dataGridView1.EndEdit();
             dataGridView1.Refresh();
-            
+
             if (backgroundWorker1.IsBusy)
             {
@@ -79,5 +79,5 @@
             backgroundWorker1.RunWorkerAsync();
 
-            
+
         }
 
@@ -85,12 +85,12 @@
         {
             int n = 0;
-            
+
             conn.Open();
-            
+
             foreach (EXPODataSet.FAKTURYRow row in eXPODataSet.FAKTURY.Rows)
             {
                 if (!backgroundWorker1.CancellationPending)
-                {                   
-                    
+                {
+
                     if (row.Exportuj)
                     {
@@ -133,5 +133,5 @@
                         {
                             transaction.Rollback();
-                            conn.Close();
+
                             //Send Email
                             StringBuilder stringBuilder = new StringBuilder();
@@ -139,5 +139,10 @@
                             stringBuilder.AppendLine("Szczegoly:");
                             stringBuilder.AppendLine(exception.ToString());
+
+                            conn.Close();
+                            bazaReklamConn.Close();
+
                             EmailSender.Send(stringBuilder.ToString());
+
                             throw;
                         }
@@ -155,7 +160,6 @@
                 else
                 {
-                   
                     conn.Close();
-                    e.Cancel = true;               
+                    e.Cancel = true;
                 }
             }
@@ -169,5 +173,5 @@
                 conn.Close();
             }
-                  
+
         }
 
@@ -178,5 +182,5 @@
                 return;
             }
-            
+
             if (toolStripProgressBar1.Maximum != nMaxProgress)
             {
@@ -191,5 +195,5 @@
 
         private void backgroundWorker1_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
-        {            
+        {
             if (e.Cancelled)
             {
@@ -209,5 +213,5 @@
             }
 
-            refresh();
+            RefreshView();
         }
 
@@ -215,5 +219,5 @@
         {
             if (backgroundWorker1.IsBusy)
-            {                
+            {
                 backgroundWorker1.CancelAsync();
             }
@@ -224,5 +228,5 @@
             if (!backgroundWorker1.IsBusy)
             {
-                refresh();
+                RefreshView();
             }
         }
