fix NRE

TV-Rename · Jun 15, 2022 · e34aa06 · e34aa06
1 parent 02c22d7
commit e34aa06
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/TVRename/Forms/BulkAddMovies/BulkAddEditMovie.cs b/TVRename/Forms/BulkAddMovies/BulkAddEditMovie.cs
@@ -23,9 +23,9 @@ public partial class BulkAddEditMovie : Form
 
         public BulkAddEditMovie([NotNull] PossibleNewMovie hint)
         {
+            codeFinderControl = new MovieCodeFinder("", TVSettings.Instance.DefaultMovieProvider) { Dock = DockStyle.Fill };
             InitializeComponent();
 
-            codeFinderControl = new MovieCodeFinder("", TVSettings.Instance.DefaultMovieProvider) { Dock = DockStyle.Fill };
             codeFinderControl.SelectionChanged += CodeChanged;
             codeFinderControl.lvMatches.DoubleClick += MatchDoubleClick;
 

diff --git a/TVRename/Forms/BulkAddShows/BulkAddEditShow.cs b/TVRename/Forms/BulkAddShows/BulkAddEditShow.cs
@@ -23,9 +23,9 @@ public partial class BulkAddEditShow : Form
 
         public BulkAddEditShow([NotNull] PossibleNewTvShow hint)
         {
+            codeFinderControl = new TvCodeFinder("", TVSettings.Instance.DefaultProvider) { Dock = DockStyle.Fill };
             InitializeComponent();
 
-            codeFinderControl = new TvCodeFinder("", TVSettings.Instance.DefaultProvider) { Dock = DockStyle.Fill };
             codeFinderControl.SelectionChanged += CodeChanged;
             codeFinderControl.lvMatches.DoubleClick += MatchDoubleClick;
             label1.Text = $"Search for {TVSettings.Instance.DefaultProvider.PrettyPrint()} entry, by partial name or ID:";

diff --git a/TVRename/Forms/ShowPreferences/AddEditMovie.cs b/TVRename/Forms/ShowPreferences/AddEditMovie.cs
@@ -36,6 +36,9 @@ public AddEditMovie([NotNull] MovieConfiguration si, TVDoc doc)
         {
             selectedShow = si;
             mDoc = doc;
+            codeFinderForm =
+                new MovieCodeFinder(si.Code != -1 ? si.Code.ToString() : si.LastName, si.Provider) { Dock = DockStyle.Fill };
+
             InitializeComponent();
             HasChanged = false;
 
@@ -47,9 +50,6 @@ public AddEditMovie([NotNull] MovieConfiguration si, TVDoc doc)
 
             lblSeasonWordPreview.ForeColor = Color.DarkGray;
 
-            codeFinderForm =
-                new MovieCodeFinder(si.Code != -1 ? si.Code.ToString() : si.LastName, si.Provider) { Dock = DockStyle.Fill };
-
             codeFinderForm.SelectionChanged += MTCCF_SelectionChanged;
 
             pnlCF.SuspendLayout();

diff --git a/TVRename/Forms/ShowPreferences/AddEditShow.cs b/TVRename/Forms/ShowPreferences/AddEditShow.cs
@@ -48,6 +48,8 @@ public AddEditShow([NotNull] ShowConfiguration si, TVDoc doc)
             sampleProcessedSeason = si.GetFirstAvailableSeason();
             sampleEpisode = si.GetFirstAvailableEpisode();
             addingNewShow = si.TvdbCode == -1 && si.TmdbCode == -1 && si.TVmazeCode == -1;
+            codeFinderForm = new TvCodeFinder(si.Code != -1 ? si.Code.ToString() : si.LastName, si.Provider) { Dock = DockStyle.Fill };
+
             InitializeComponent();
             HasChanged = false;
 
@@ -56,8 +58,6 @@ public AddEditShow([NotNull] ShowConfiguration si, TVDoc doc)
 
             SetupDropDowns(si);
 
-            codeFinderForm = new TvCodeFinder(si.Code != -1 ? si.Code.ToString() : si.LastName, si.Provider) { Dock = DockStyle.Fill };
-
             codeFinderForm.SelectionChanged += MTCCF_SelectionChanged;
 
             pnlCF.SuspendLayout();