Commits

Rainer Hilmer committed d4466e3 Merge

Merge branch 'hotfix/Issue-32'

Comments (0)

Files changed (4)

       private static readonly object SyncLock = new object();
       private readonly ConfigurationHandling _configHandling;
       private readonly string _fileRepo;
+      internal bool _hqLessModeManuallySwitched;
       private readonly KeyHandling _keyHandling;
       private readonly string _logFile;
       private readonly StateBroker _stateBroker;
          Configuration = _configHandling.ReadConfig();
          if(ConfigurationError)
             return;
-         if(JobElements.HQLess)
+         if(!_hqLessModeManuallySwitched)
             JobElements.HQLess = Configuration.HQLessByDefault;
          JobElements.VehicleModelName = Configuration.VehicleName;
          JobElements.CustomerModel = Configuration.CustomerModel;
          JobElements.NextState = ServiceState.ShutdownApproved;
       }
 
-      internal void StartUp()
+      internal void Trigger()
       {
          // Ja hier auch, weil die Config sonst nur mit der Aktivierung des Scripts gelesen wird.
          EstablishConfigFromFile();
             JobElements.ModIsActive = true;
             CommonFunctions.DisplayText("Transport service is now activated.", 5000);
          }
-         else if(JobElements.HQLess && !Player.Character.isInVehicle())
+         if(JobElements.HQLess && !Player.Character.isInVehicle())
          {
             CommonFunctions.DisplayText("Enter a vehicle and try again.", 3000);
          }

PTS/PTS/KeyHandling.cs

             if (_core.JobElements.HQElementsEstablished)
                _core.JobElements.DeleteHQElements();
             _core.JobElements.HQLess = true;
+            _core._hqLessModeManuallySwitched = true;
             _core.JobElements.CurrentVehicle = Player.Character.CurrentVehicle;
             CommonFunctions.DisplayText("PTS HQ-less mode now established.", 5000);
             return;
             return;
          }
          _core.JobElements.HQLess = false;
-         CommonFunctions.DisplayText("PTS regular duty mode established.", 5000);
+         _core._hqLessModeManuallySwitched = true;
+         CommonFunctions.DisplayText("PTS HQ mode established.", 5000);
       }
 
       private void AtImmediateShutdownKey(KeyEventArgs e)
             return;
          if (!_core.JobElements.ModIsActive)
          {
-            _core.StartUp();
+            _core.Trigger();
             return;
          }
          _core.RequestShutdown();

PTS/PTS/Properties/AssemblyInfo.cs

 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("4.1.7.*")]
+[assembly: AssemblyVersion("4.1.8.*")]
 //[assembly: AssemblyFileVersion("1.0.*")]
 
 [assembly: InternalsVisibleTo("PTS.Tests")]

PTS/PTS/bin/x86/Release/PTS.net.dll

Binary file modified.