Merge pull request #655 from cjakeman/menu-block-bad-content-location

Menu block for bad content location

Author: cjakeman

Source/Documentation/Manual/options.rst

@@ -447,9 +447,10 @@ Content Options
 
 .. image:: images/options-content.png
 
-This window allows you to add, remove or modify access to additional MSTS
-installations or miniroute installations for Open Rails. Installations
-located on other drives, or on a USB key, can be added even if they are
+This window allows you to add, remove or modify access to content.
+Each profile may be a folder containing one or more routes, or an MSTS
+installation. 
+Profiles located on other drives, or on a USB key, can be added even if they are
 not always available.
 
 Click on the *Add* button, and locate the desired installation. ORTS will
@@ -458,6 +459,12 @@ appear in the *Installation set:* window on the main menu form. Modify
 the name if desired, then click *OK* to add the new path and name to
 Open Rails.
 
+Please do not store content or any files within the folder containing the Open Rails software.
+This is because the Updater operates by wiping out the contents of that folder before replacing it
+with a new updated version. 
+It would be unfriendly for users to lose content that they have stored there, so
+attempts to add a profile folder stored there are blocked and lead to an error message. 
+
 To remove an entry (note that this does not remove the installation
 itself!) select the entry in the window, and click *Delete*, then *OK*
 to close the window. To modify an entry, use the *Change...* button to

Source/Documentation/Manual/start.rst

@@ -8,24 +8,30 @@ After having successfully installed Open Rails (see the Installation
 Manual), to run the game you must double-click on the Open Rails icon on 
 the desktop, or on the OpenRails.exe file.
 
-The OpenRails main window will appear. This displays your available MSTS 
-installation profiles.
+The OpenRails main window will appear. 
+If you have an MSTS installation in place, this will be displayed as your available 
+installation profile.
 
 .. _start-picture:
 
 .. image:: images/start-activity.png
 
+If not, then you must download some content and add it as an Installation Profile.
+
 Installation Profiles
 =====================
 
-In the simplest case, where you have only a basic MSTS installation (see 
+Each profile may be a folder containing one or more routes, or an optional MSTS
+installation.
+
+In the case where you already have an MSTS installation (see 
 paragraph :ref:`Does Open Rails need MSTS to run? <intro-MSTSneeded>` for a precise definition of 
 a MSTS installation) OR should already correctly point to that 
 installation. To check this, you should initially see under ``Installation 
 Profile`` the string ``- Default -``. Under ``Route`` you should see the 
 name of one of the MSTS routes in your MSTS installation.
 
-You can easily add, remove or move other MSTS installations and select 
+You can easily add, remove or move other content profiles and select 
 among them (e.g. if you have any so-called ``mini-routes`` installed.). 
 Click on the ``Options`` button and select the ``Content`` tab. See the 
 :ref:`Content Options <options-Content>` discussed below for more instructions.

Source/Menu/Options.cs

@@ -677,6 +677,11 @@ private void buttonContentAdd_Click(object sender, EventArgs e)
         }
 
         private void buttonContentDelete_Click(object sender, EventArgs e)
+        {
+            DeleteContent();
+        }
+
+        private void DeleteContent()
         {
             bindingSourceContent.RemoveCurrent();
             // ResetBindings() is to work around a bug in the binding and/or data grid where by deleting the bottom item doesn't show the selection moving to the new bottom item.
@@ -716,7 +721,19 @@ private void textBoxContentName_TextChanged(object sender, EventArgs e)
             var current = bindingSourceContent.Current as ContentFolder;
             if (current != null && current.Name != textBoxContentName.Text)
             {
-                // Duplicate names lead to an exception, so append " copy" if not unique
+                if (current.Path.ToLower().Contains(Application.StartupPath.ToLower()))
+                {
+                    // Block 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 folder {Application.StartupPath}\n\n")
+                        , "Invalid content location"
+                        , MessageBoxButtons.OK
+                        , MessageBoxIcon.Error);
+                    DeleteContent();
+                    return;
+                }
+
+                // Duplicate names lead to an exception, so append " copy" repeatedly until no longer unique
                 var suffix = "";
                 var isNameUnique = true;
                 while (isNameUnique)