aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms/WinformsDesktop.cs
diff options
context:
space:
mode:
authorAShifter <[email protected]>2017-03-11 09:22:10 -0700
committerAShifter <[email protected]>2017-03-11 09:22:10 -0700
commitd15965e442a1d29424f2e6f315dae3281154f944 (patch)
tree26002bfe906c3ba2f881e365ca94c712950f395d /ShiftOS.WinForms/WinformsDesktop.cs
parentbb768396787bd0ea5e608f007d881edec693f2ed (diff)
parent2ff261328740cbb628678605b09800f22c9b67a9 (diff)
downloadshiftos_thereturn-d15965e442a1d29424f2e6f315dae3281154f944.tar.gz
shiftos_thereturn-d15965e442a1d29424f2e6f315dae3281154f944.tar.bz2
shiftos_thereturn-d15965e442a1d29424f2e6f315dae3281154f944.zip
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
Diffstat (limited to 'ShiftOS.WinForms/WinformsDesktop.cs')
-rw-r--r--ShiftOS.WinForms/WinformsDesktop.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index 8900a69..d30adb4 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -63,8 +63,10 @@ namespace ShiftOS.WinForms
NotificationDaemon.NotificationMade += (note) =>
{
//Soon this will pop a balloon note.
- btnnotifications.Text = "Notifications (" + NotificationDaemon.GetUnreadCount().ToString() + ")";
-
+ this.Invoke(new Action(() =>
+ {
+ btnnotifications.Text = "Notifications (" + NotificationDaemon.GetUnreadCount().ToString() + ")";
+ }));
};
NotificationDaemon.NotificationRead += () =>