c-my/FluentTerminal
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crash on close; Resizing leads to freezed terminals. (#505)

Browse Source 
* - Prevent crash on close of uninitilized terminal.
- Reset Action reference from DebouncedAction instance.

* Define CloseCommand as AsyncCommand.
This commit is contained in:
Max Risuhin authored and Felix committed 2019-08-28 14:39:58 +02:00
1 parent 09e4381ea7
commit 5eecbc6718
5 files changed
+71 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

FluentTerminal.App.ViewModels/MainViewModel.cs
+7 -7
View File
@@ -375,17 +375,17 @@ namespace FluentTerminal.App.ViewModels
if (sender is TerminalViewModel terminal)
{
Array.ForEach<TerminalViewModel>(Terminals.ToArray(),
t => {
async t => {
if (terminal != t)
{
Logger.Instance.Debug("Terminal with Id: {@id} closed.", t.Terminal.Id);
t.CloseCommand.Execute(EventArgs.Empty);
await t.CloseCommand.ExecuteAsync();
}
});
}
}
private void Terminal_CloseRightTabsRequested(object sender, EventArgs e)
private async void Terminal_CloseRightTabsRequested(object sender, EventArgs e)
{
if (sender is TerminalViewModel terminal)
{
@@ -393,12 +393,12 @@ namespace FluentTerminal.App.ViewModels
{
var terminalToRemove = Terminals[i];
Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminalToRemove.Terminal.Id);
terminalToRemove.CloseCommand.Execute(EventArgs.Empty);
await terminalToRemove.CloseCommand.ExecuteAsync();
}
}
}
private void Terminal_CloseLeftTabsRequested(object sender, EventArgs e)
private async void Terminal_CloseLeftTabsRequested(object sender, EventArgs e)
{
if (sender is TerminalViewModel terminal)
{
@@ -406,7 +406,7 @@ namespace FluentTerminal.App.ViewModels
{
var terminalToRemove = Terminals[i];
Logger.Instance.Debug("Terminal with Id: {@id} closed.", terminalToRemove.Terminal.Id);
terminalToRemove.CloseCommand.Execute(EventArgs.Empty);
await terminalToRemove.CloseCommand.ExecuteAsync();
}
}
}
@@ -464,7 +464,7 @@ namespace FluentTerminal.App.ViewModels
private void CloseCurrentTab()
{
SelectedTerminal?.CloseCommand.Execute(null);
SelectedTerminal?.CloseCommand.ExecuteAsync();
}
private void NewWindow(NewWindowAction showSelection)