VOID_Orbital, VOID_Tools: Added some guards to prevent NREs when various vessel references are null.
--- /dev/null
+++ b/VOID.csproj
@@ -1,1 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug_win</Configuration>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{45ACC1CC-942C-4A66-BFC7-8BE375938B18}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>VOID</RootNamespace>
+ <AssemblyName>VOID</AssemblyName>
+ <CodePage>65001</CodePage>
+ <UseMSBuildEngine>False</UseMSBuildEngine>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_win|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug</OutputPath>
+ <DefineConstants>DEBUG; TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CustomCommands>
+ <CustomCommands>
+ <Command type="AfterBuild" command="xcopy /Y ${TargetFile} ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" />
+ </CustomCommands>
+ </CustomCommands>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_win|AnyCPU' ">
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Release</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <DefineConstants>TRACE</DefineConstants>
+ <CustomCommands>
+ <CustomCommands>
+ <Command type="AfterBuild" command="xcopy /Y ${TargetFile} ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" />
+ </CustomCommands>
+ </CustomCommands>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_linux|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug</OutputPath>
+ <DefineConstants>DEBUG; TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CustomCommands>
+ <CustomCommands>
+ <Command type="AfterBuild" command="cp -afv ${TargetFile} /opt/games/KSP_linux/GameData/${ProjectName}/Plugins/" />
+ </CustomCommands>
+ </CustomCommands>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_linux|AnyCPU' ">
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Release</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CustomCommands>
+ <CustomCommands>
+ <Command type="AfterBuild" command="cp -afv ${TargetFile} /opt/games/KSP_linux/GameData/${ProjectName}/Plugins/" />
+ </CustomCommands>
+ </CustomCommands>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="IVOID_Module.cs" />
+ <Compile Include="VOIDFlightMaster.cs" />
+ <Compile Include="VOID_Core.cs" />
+ <Compile Include="VOID_Module.cs" />
+ <Compile Include="VOID_HUD.cs" />
+ <Compile Include="VOID_SaveValue.cs" />
+ <Compile Include="VOID_Orbital.cs" />
+ <Compile Include="VOID_SurfAtmo.cs" />
+ <Compile Include="VOID_VesselInfo.cs" />
+ <Compile Include="VOID_Transfer.cs" />
+ <Compile Include="VOID_CBInfoBrowser.cs" />
+ <Compile Include="VOID_Rendezvous.cs" />
+ <Compile Include="VOID_VesselRegister.cs" />
+ <Compile Include="VOID_DataLogger.cs" />
+ <Compile Include="VOID_EditorCore.cs" />
+ <Compile Include="VOID_EditorHUD.cs" />
+ <Compile Include="VOID_DataValue.cs" />
+ <Compile Include="VOIDEditorMaster.cs" />
+ <Compile Include="VOID_Tools.cs" />
+ <Compile Include="VOID_Localization.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <Policies>
+ <TextStylePolicy FileWidth="120" TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/plain" />
+ </Policies>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <Reference Include="System">
+ <HintPath>..\_KSPAssemblies\System.dll</HintPath>
+ </Reference>
+ <Reference Include="Assembly-CSharp">
+ <HintPath>..\_KSPAssemblies\Assembly-CSharp.dll</HintPath>
+ </Reference>
+ <Reference Include="UnityEngine">
+ <HintPath>..\_KSPAssemblies\UnityEngine.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\ToadicusTools\ToadicusTools.csproj">
+ <Project>{D48A5542-6655-4149-BC27-B27DF0466F1C}</Project>
+ <Name>ToadicusTools</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\VesselSimulator\VesselSimulator.csproj">
+ <Project>{30FD6C0B-D36E-462F-B0FF-F0FAC9C666CF}</Project>
+ <Name>VesselSimulator</Name>
+ </ProjectReference>
+ </ItemGroup>
+</Project>
--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -484,6 +484,10 @@
Math.Pow(VOID_Core.Instance.vessel.Radius(), 2);
SimManager.TryStartSimulation();
}
+ else if (!this.vesselSimActive)
+ {
+ SimManager.ClearResults();
+ }
if (!this.guiRunning)
{
--- a/VOID_EditorCore.cs
+++ b/VOID_EditorCore.cs
@@ -134,6 +134,10 @@
SimManager.Gravity = VOID_Data.KerbinGee;
SimManager.TryStartSimulation();
}
+ else if (!this.vesselSimActive)
+ {
+ SimManager.ClearResults();
+ }
this.CheckAndSave ();
}
--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -129,7 +129,14 @@
{
public static readonly VOID_StrValue primaryName = new VOID_StrValue (
VOID_Localization.void_primary,
- new Func<string> (() => VOID_Core.Instance.vessel.mainBody.name)
+ delegate()
+ {
+ if (VOID_Core.Instance.vessel == null)
+ {
+ return string.Empty;
+ }
+ return VOID_Core.Instance.vessel.mainBody.name;
+ }
);
public static readonly VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
--- a/VOID_Tools.cs
+++ b/VOID_Tools.cs
@@ -111,6 +111,11 @@
public static ExperimentSituations GetExperimentSituation(this Vessel vessel)
{
+ if (vessel == null)
+ {
+ return ExperimentSituations.SrfSplashed;
+ }
+
Vessel.Situations situation = vessel.situation;
switch (situation)