Merge branch 'dev' into systemtray
This commit is contained in:
commit
b4bacd50a1
36 changed files with 1781 additions and 1139 deletions
|
@ -63,7 +63,7 @@ namespace WinUI
|
|||
|
||||
networkId.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
|
||||
{
|
||||
this.networkId.Content = status.Address;
|
||||
this.networkId.Text = status.Address;
|
||||
}));
|
||||
versionString.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
|
||||
{
|
||||
|
@ -80,7 +80,7 @@ namespace WinUI
|
|||
|
||||
networkId.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
|
||||
{
|
||||
this.networkId.Content = "";
|
||||
this.networkId.Text = "";
|
||||
}));
|
||||
versionString.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue