From 4f43a84c354d53251614fe6fa4c1b9df92839f57 Mon Sep 17 00:00:00 2001
From: Nikolaj Olsson <nikse.dk@gmail.com>
Date: Tue, 2 May 2017 04:58:49 +0200
Subject: [PATCH] Fixed  "Video auto-load" a few places - thx Ede123 :) Fix
 #2365

---
 LanguageMaster.xml |  2 +-
 src/Forms/Main.cs  | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/LanguageMaster.xml b/LanguageMaster.xml
index 00eefd4b6..2a6a1ed15 100644
--- a/LanguageMaster.xml
+++ b/LanguageMaster.xml
@@ -1736,7 +1736,7 @@ can edit in same subtitle file (collaboration)</Information>
     <AutoBackupEveryMinute>Every minute</AutoBackupEveryMinute>
     <AutoBackupEveryFiveMinutes>Every 5th minute</AutoBackupEveryFiveMinutes>
     <AutoBackupEveryFifteenMinutes>Every 15th minute</AutoBackupEveryFifteenMinutes>
-    <AutoBackupDeleteAfter>Delete backup after</AutoBackupDeleteAfter>
+    <AutoBackupDeleteAfter>Delete after</AutoBackupDeleteAfter>
     <AutoBackupDeleteAfterOneMonth>1 month</AutoBackupDeleteAfterOneMonth>
     <AutoBackupDeleteAfterThreeMonths>3 months</AutoBackupDeleteAfterThreeMonths>
     <AutoBackupDeleteAfterSixMonths>6 months</AutoBackupDeleteAfterSixMonths>
diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs
index 72139e4b8..7b2698d55 100644
--- a/src/Forms/Main.cs
+++ b/src/Forms/Main.cs
@@ -10589,7 +10589,10 @@ namespace Nikse.SubtitleEdit.Forms
                     Text = Title;
 
                     Configuration.Settings.Save();
-                    OpenVideo(fileName);
+                    if (!Configuration.Settings.General.DisableVideoAutoLoading)
+                    {
+                        OpenVideo(fileName);
+                    }
                 }
             }
             return true;
@@ -10782,7 +10785,8 @@ namespace Nikse.SubtitleEdit.Forms
                                     if (subtitleChooser.ShowDialog(this) == DialogResult.OK)
                                     {
                                         if (LoadMatroskaSubtitle(subtitleList[subtitleChooser.SelectedIndex], matroska, false) &&
-                                            (ext.Equals(".mkv", StringComparison.Ordinal)) || ext.Equals(".mks", StringComparison.Ordinal))
+                                            (ext.Equals(".mkv", StringComparison.Ordinal) || ext.Equals(".mks", StringComparison.Ordinal)) &&
+                                            !Configuration.Settings.General.DisableVideoAutoLoading)
                                         {
                                             OpenVideo(fileName);
                                         }
@@ -10792,7 +10796,8 @@ namespace Nikse.SubtitleEdit.Forms
                             else
                             {
                                 if (LoadMatroskaSubtitle(subtitleList[0], matroska, false) &&
-                                    (ext.Equals(".mkv", StringComparison.Ordinal) || ext.Equals(".mks", StringComparison.Ordinal)))
+                                    (ext.Equals(".mkv", StringComparison.Ordinal) || ext.Equals(".mks", StringComparison.Ordinal)) &&
+                                    !Configuration.Settings.General.DisableVideoAutoLoading)
                                 {
                                     OpenVideo(fileName);
                                 }
@@ -11891,7 +11896,7 @@ namespace Nikse.SubtitleEdit.Forms
                         if (p.StartTime.TotalSeconds > audioVisualizer.EndPositionSeconds + 0.2)
                         {
                             audioVisualizer.StartPositionSeconds = mediaPlayer.CurrentPosition - 0.2;
-                        }                        
+                        }
                         break;
                     }
                 }
@@ -13425,7 +13430,10 @@ namespace Nikse.SubtitleEdit.Forms
                         ResetSubtitle();
                         if (!string.IsNullOrEmpty(importText.VideoFileName))
                         {
-                            OpenVideo(importText.VideoFileName);
+                            if (!Configuration.Settings.General.DisableVideoAutoLoading)
+                            {
+                                OpenVideo(importText.VideoFileName);
+                            }
                             _fileName = importText.VideoFileName;
                             _converted = true;
                         }