Removed atlas .net 8 output folder

Fixed crash in Glue when cancelling out of creating a file.
vchelaru · Jan 23, 2024 · 406f779 · 406f779
1 parent 237b8df
commit 406f779
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/FRBDK/AchxToSpineAtlas/AchxToSpineAtlas/AchxToSpineAtlas.csproj b/FRBDK/AchxToSpineAtlas/AchxToSpineAtlas/AchxToSpineAtlas.csproj
@@ -5,6 +5,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+	<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+	<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/FRBDK/Glue/Glue/SaveClasses/GlueProjectSaveExtensionMethods.cs b/FRBDK/Glue/Glue/SaveClasses/GlueProjectSaveExtensionMethods.cs
@@ -182,16 +182,18 @@ public static ReferencedFileSave AddReferencedFileSave(GlueElement element, stri
                 // that's exactly what we're doing.
                 rfs = AddExistingFileManager.Self.AddSingleFile(createdFile, ref userCancelled, option, elementToAddTo:element, forcedAti:resultAssetTypeInfo);
 
-                if(resultAssetTypeInfo?.QualifiedRuntimeTypeName.QualifiedType != null && rfs.RuntimeType != resultAssetTypeInfo.QualifiedRuntimeTypeName.QualifiedType)
-                {
-                    rfs.RuntimeType = resultAssetTypeInfo.QualifiedRuntimeTypeName.QualifiedType;
-                }
-
                 if (rfs == null && !userCancelled)
                 {
                     throw new NullReferenceException("The RFS shouldn't be null");
                 }
 
+                if(rfs != null)
+                {
+                    if(resultAssetTypeInfo?.QualifiedRuntimeTypeName.QualifiedType != null && rfs.RuntimeType != resultAssetTypeInfo.QualifiedRuntimeTypeName.QualifiedType)
+                    {
+                        rfs.RuntimeType = resultAssetTypeInfo.QualifiedRuntimeTypeName.QualifiedType;
+                    }
+                }
             }
 
             #endregion