solve merge error

Author: sweiland-openrails

Source/Menu/DownloadContentForm.cs

@@ -204,7 +204,7 @@ private async void DownloadContentButton_Click(object sender, EventArgs e)
             string topPathDirectoryExe = determineTopDirectory(pathDirectoryExe.Substring(6));
             string topInstallPath = determineTopDirectory(installPath);
 
-            if (OptionsForm.isWrongPath(installPath, Catalog)) {
+            if (OptionsForm.ContentFolder.isWrongPath(installPath, Catalog)) {
                 // cancelled
                 EnableButtons();
                 return;

Source/Menu/Options.cs

@@ -56,6 +56,22 @@ public ContentFolder()
                 Name = "";
                 Path = "";
             }
+
+            public static bool isWrongPath(string path, GettextResourceManager catalog)
+            {
+                if (path.ToLower().Contains(Application.StartupPath.ToLower()))
+                {
+                    // check added because a succesful Update operation will empty the Open Rails folder and lose any content stored within it.
+                    MessageBox.Show(catalog.GetString
+                        ($"Cannot use content from any folder which lies inside the Open Rails program folder {Application.StartupPath}\n\n")
+                        , "Invalid content location"
+                        , MessageBoxButtons.OK
+                        , MessageBoxIcon.Error);
+                    return true;
+        }
+
+                return false;
+            }
         }
 
         public OptionsForm(UserSettings settings, UpdateManager updateManager, bool initialContentSetup)
@@ -728,7 +744,7 @@ private void textBoxContentName_TextChanged(object sender, EventArgs e)
             var current = bindingSourceContent.Current as ContentFolder;
             if (current != null && current.Name != textBoxContentName.Text)
             {
-                if (isWrongPath(current.Path, catalog))
+                if (ContentFolder.isWrongPath(current.Path, catalog))
                 {
                     DeleteContent();
                     return;
@@ -786,22 +802,6 @@ private void checkPerformanceTuner_Click(object sender, EventArgs e)
             labelPerformanceTunerTarget.Enabled = checkPerformanceTuner.Checked;
         }
 
-        public static bool isWrongPath(string path, GettextResourceManager catalog)
-        {
-            if (path.ToLower().Contains(Application.StartupPath.ToLower()))
-            {
-                // check added because a succesful Update operation will empty the Open Rails folder and lose any content stored within it.
-                MessageBox.Show(catalog.GetString
-                    ($"Cannot use content from any folder which lies inside the Open Rails program folder {Application.StartupPath}\n\n")
-                    , "Invalid content location"
-                    , MessageBoxButtons.OK
-                    , MessageBoxIcon.Error);
-                return true;
-            }
-
-            return false;
-        }
-
         #region Help for Options
         // The icons all share the same code which assumes they are named according to a simple scheme as follows:
         //   1. To add a new Help Icon, copy an existing one and paste it onto the tab.