stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-23 12:22:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Used slightly better approach for executing stuff in the main thread

Browse source
This commit is contained in:
ZZYZX 2019-12-28 22:01:57 +02:00
parent bd811aac7d
commit f41c5bdd6f
2 changed files with 16 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/Rendering/TextLabel.cs
View file

@ -151,7 +151,7 @@ namespace CodeImp.DoomBuilder.Rendering
{
ff = new FontFamily(General.Settings.TextLabelFontName);
}
catch (Exception e)
catch (Exception)
{
ff = General.MainWindow.Font.FontFamily;
}

49
Source/Core/Windows/MainForm.cs
View file

@ -282,11 +282,6 @@ namespace CodeImp.DoomBuilder.Windows
//mxd. Hints
hintsPanel = new HintsPanel();
hintsDocker = new Docker("hints", "Help", hintsPanel);
// [ZZ]
InvokeTimer.Tick += new EventHandler(InvokeHandler);
InvokeTimer.Interval = 10;
InvokeTimer.Start();
}
#endregion
@ -4117,37 +4112,23 @@ namespace CodeImp.DoomBuilder.Windows
#region ================== Threadsafe updates
Timer InvokeTimer = new Timer();
List<System.Action> InvokeActions = new List<System.Action>();
// this is actually InvokeTimer.Tick handler
void InvokeHandler(object sender, EventArgs e)
{
InvokeTimer.Stop();
List<System.Action> actions = null;
lock (InvokeActions)
{
if (InvokeActions.Count > 0)
{
actions = new List<System.Action>();
actions.AddRange(InvokeActions);
}
}
if (actions == null)
return;
foreach (System.Action action in actions)
action();
InvokeTimer.Start();
}
public void RunOnUIThread(System.Action action)
{
if (!InvokeRequired) action();
else lock (InvokeActions) InvokeActions.Add(action);
if (!InvokeRequired)
{
action();
return;
}
IAsyncResult result = null;
result = BeginInvoke(new System.Action(() =>
{
action();
// this may happen if exiting
while (result == null)
System.Threading.Thread.Sleep(1);
EndInvoke(result);
}));
}
public void UpdateStatus()