Skip to content

Commit 0bf4c00

Browse files
committed
stop winforms release build crashing
1 parent b3e350f commit 0bf4c00

File tree

2 files changed

+3
-35
lines changed

2 files changed

+3
-35
lines changed

WinGui/MainForm.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -201,20 +201,14 @@ void MainForm_Load(object sender, EventArgs e)
201201
// can only do this after window handle has been created (so can't do in constructor)
202202
((Logger)logger).LogAdded += (s, e) => lbLogs.Invoke(() => lbLogs.Items.Insert(0, e.Log));
203203

204-
InitUI(cbVanillaObjects.Checked, tbFileFilter.Text);
204+
InitToolStripMenuItems();
205205
}
206206

207207
void InitUI(bool vanillaOnly, string filter)
208208
{
209-
// required to load the object type images from g1.dat
210-
//if (Directory.Exists(model.Settings.DataDirectory))
211-
//{
212-
// _ = model.LoadDataDirectory(model.Settings.DataDirectory);
213-
//}
214-
209+
InitToolStripMenuItems();
215210
InitFileTreeView(vanillaOnly, filter);
216211
InitCategoryTreeView(vanillaOnly, filter);
217-
InitToolStripMenuItems();
218212
}
219213

220214
bool LoadObjDataDirectory(string directory, bool useExistingIndex)

WinGui/MainFormModel.cs

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,6 @@ public MainFormModel(ILogger logger, string settingsFile, PaletteMap paletteMap)
5454
{
5555
logger.Debug($"Preloading dependent {depObjectType} objects");
5656
}
57-
58-
foreach (var dep in ObjectIndex.Objects.Where(x => x is ObjectIndexEntry oi && dependentObjectTypes.Contains(oi.ObjectType)))
59-
{
60-
var filename = Path.Combine(Settings.ObjDataDirectory, dep.Filename);
61-
#if DEBUG
62-
SawyerStreamReader.LoadFullObjectFromFile(filename, logger);
63-
#else
64-
try
65-
{
66-
SawyerStreamReader.LoadFullObjectFromFile(filename);
67-
}
68-
catch (Exception ex)
69-
{
70-
logger.Error($"File=\"{filename}\" Message=\"{ex.Message}\"");
71-
}
72-
#endif
73-
}
7457
}
7558

7659
public EditorSettings Settings { get; private set; }
@@ -94,16 +77,7 @@ public void LoadSettings(string settingsFile)
9477

9578
Settings = settings!;
9679

97-
if (!ValidateSettings(Settings, logger))
98-
{
99-
return;
100-
}
101-
102-
if (File.Exists(Settings.GetObjDataFullPath(Settings.IndexFileName)))
103-
{
104-
logger.Info($"Loading header index from \"{Settings.IndexFileName}\"");
105-
LoadObjDirectory(Settings.ObjDataDirectory, new Progress<float>(), true);
106-
}
80+
_ = !ValidateSettings(Settings, logger);
10781
}
10882

10983
static bool ValidateSettings(EditorSettings settings, ILogger logger)

0 commit comments

Comments
 (0)