PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Merge pull request #227 from sirhamsteralot/master

Browse Source 
Fixed [Theme Bug] #226 / Fixed Crash when plugin has no UI
This commit is contained in:
John Gross
2018-04-13 12:02:26 -07:00
committed by GitHub
parent 85e307f8db bfcf96f1ad
commit c1e315fa40
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Torch.Server/ViewModels/PluginViewModel.cs
View File

@@ -32,6 +32,9 @@ namespace Torch.Server.ViewModels
public void UpdateResourceDict(ResourceDictionary dictionary) public void UpdateResourceDict(ResourceDictionary dictionary)
{ {
if (this.Control == null)
return;
this.Control.Resources.MergedDictionaries.Clear(); this.Control.Resources.MergedDictionaries.Clear();
this.Control.Resources.MergedDictionaries.Add(dictionary); this.Control.Resources.MergedDictionaries.Add(dictionary);
} }

2
Torch.Server/Views/TorchUI.xaml
View File

@@ -63,7 +63,7 @@
</StackPanel> </StackPanel>
<TabControl Grid.Row="2" Height="Auto" x:Name="TabControl" Margin="5,10,5,5"> <TabControl Grid.Row="2" Height="Auto" x:Name="TabControl" Margin="5,10,5,5">
<TabItem Header="Log"> <TabItem Header="Log">
<RichTextBox x:Name="ConsoleText" VerticalScrollBarVisibility="Visible" FontFamily="Consolas"/> <RichTextBox x:Name="ConsoleText" VerticalScrollBarVisibility="Visible" FontFamily="Consolas" IsReadOnly="True"/>
</TabItem> </TabItem>
<TabItem Header="Configuration"> <TabItem Header="Configuration">
<Grid IsEnabled="{Binding CanRun}"> <Grid IsEnabled="{Binding CanRun}">