Merge branch 'master-u' into ttml-review

DSRCorporation · Mar 15, 2017 · d34f710 · d34f710
2 parents a9bc9a9 + 103dec7
commit d34f710
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Controls/SubtitleListView.cs b/src/Controls/SubtitleListView.cs
@@ -794,7 +794,10 @@ private void SubtitleListViewLastColumnFill(object sender, EventArgs e)
             {
                 width += Columns[i].Width;
             }
-            Columns[Columns.Count - 1].Width = Width - (width + 25);
+            if (Columns.Count > 0)
+            {
+                Columns[Columns.Count - 1].Width = Width - (width + 25);
+            }
         }
 
         public void SaveFirstVisibleIndex()

diff --git a/src/Forms/GetDictionaries.cs b/src/Forms/GetDictionaries.cs
@@ -122,7 +122,6 @@ private void buttonDownload_Click(object sender, EventArgs e)
                 var wc = new WebClient { Proxy = Utilities.GetProxy() };
                 wc.DownloadDataCompleted += wc_DownloadDataCompleted;
                 wc.DownloadDataAsync(new Uri(url));
-                Cursor = Cursors.Default;
             }
             catch (Exception exception)
             {
@@ -137,6 +136,7 @@ private void buttonDownload_Click(object sender, EventArgs e)
 
         private void wc_DownloadDataCompleted(object sender, DownloadDataCompletedEventArgs e)
         {
+            Cursor = Cursors.Default;
             if (e.Error != null && _xmlName == "Nikse.SubtitleEdit.Resources.HunspellDictionaries.xml.gz")
             {
                 MessageBox.Show("Unable to connect to extensions.services.openoffice.org... Switching host - please re-try!");