Skip to content

Commit 9acb1a6

Browse files
Updated lslib (LSJ fix), disabled the Custom tab for now
1 parent cbbe22e commit 9acb1a6

4 files changed

Lines changed: 12 additions & 3 deletions

File tree

SCG.Modules/DOS2DE/Data/View/DOS2DEModuleData.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,11 @@ public DOS2DEModuleData() : base(DOS2DE_ModuleDisplayName, DOS2DE_ModuleFolderNa
254254
OpenInLocalizationEditorCommand = ReactiveCommand.CreateFromTask<ModProjectData, Unit>(DOS2DEProjectsView.OpenLocalizationEditorForProject);
255255

256256
OpenInLocalizationEditorCommand.IsExecuting.ToProperty(this, x => x.OpeningLocaleEditor, out openingLocaleEditor);
257-
OpenInLocalizationEditorCommand.ThrownExceptions.Subscribe(ex => Log.Here().Error("Error opening Localization Editor: ", ex.ToString()));
257+
OpenInLocalizationEditorCommand.ThrownExceptions.Subscribe((ex) =>
258+
{
259+
Log.Here().Error($"Error opening Localization Editor: {ex}");
260+
System.Diagnostics.Trace.WriteLine(ex.ToString());
261+
});
258262

259263
this.WhenAnyValue(x => x.Settings.IgnoredHandlesList).Subscribe((f) =>
260264
{

SCG.Modules/DOS2DE/Data/View/Locale/LocaleViewModel.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,11 @@ public CustomLocaleTabGroup CustomGroup
317317

318318
private List<LocaleTabGroup> GetCoreGroups()
319319
{
320+
#if DEBUG
320321
return new List<LocaleTabGroup>() { PublicGroup, ModsGroup, DialogGroup, JournalGroup, CustomGroup };
322+
#else
323+
return new List<LocaleTabGroup>() { PublicGroup, ModsGroup, DialogGroup, JournalGroup };
324+
#endif
321325
}
322326

323327
private LocaleTabGroup combinedGroup;
@@ -3303,7 +3307,7 @@ public LocaleViewModel() : base()
33033307
RootTemplatesGroup,
33043308
GlobalTemplatesGroup,
33053309
LevelDataGroup,
3306-
CustomGroup
3310+
//CustomGroup
33073311
};
33083312
#endif
33093313
foreach (var g in Groups)

SCG.Modules/DOS2DE/SCG.Modules.DOS2DE.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
36+
<PlatformTarget>x64</PlatformTarget>
3637
</PropertyGroup>
3738
<PropertyGroup>
3839
<RunPostBuildEvent>Always</RunPostBuildEvent>

SourceControlGenerator/SourceControlGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<Prefer32Bit>false</Prefer32Bit>
4949
</PropertyGroup>
5050
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
51-
<PlatformTarget>AnyCPU</PlatformTarget>
51+
<PlatformTarget>x64</PlatformTarget>
5252
<DebugType>pdbonly</DebugType>
5353
<Optimize>true</Optimize>
5454
<OutputPath>bin\Release\</OutputPath>

0 commit comments

Comments
 (0)