aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication
diff options
context:
space:
mode:
authorLukePulverenti <luke.pulverenti@gmail.com>2013-03-08 11:40:01 -0500
committerLukePulverenti <luke.pulverenti@gmail.com>2013-03-08 11:40:01 -0500
commitdbf6081a9b5eb80cc96e0551e5631e2b1890a14c (patch)
treedf68304f099e65d90ccf986c1572c87777001d69 /MediaBrowser.ServerApplication
parent6ff65ba2781d23fef3a4b042f3fca4ac1aeb7375 (diff)
Add PrimaryImageAspectRatio to user dto
Diffstat (limited to 'MediaBrowser.ServerApplication')
-rw-r--r--MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs6
-rw-r--r--MediaBrowser.ServerApplication/MainWindow.xaml2
-rw-r--r--MediaBrowser.ServerApplication/MainWindow.xaml.cs5
3 files changed, 11 insertions, 2 deletions
diff --git a/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs b/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
index 13359fced..b498a6fe4 100644
--- a/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
+++ b/MediaBrowser.ServerApplication/EntryPoints/WebSocketEvents.cs
@@ -172,9 +172,11 @@ namespace MediaBrowser.ServerApplication.EntryPoints
/// </summary>
/// <param name="sender">The sender.</param>
/// <param name="e">The e.</param>
- void userManager_UserUpdated(object sender, GenericEventArgs<User> e)
+ async void userManager_UserUpdated(object sender, GenericEventArgs<User> e)
{
- _serverManager.SendWebSocketMessage("UserUpdated", new DtoBuilder(_logger).GetDtoUser(e.Argument));
+ var dto = await new DtoBuilder(_logger).GetUserDto(e.Argument).ConfigureAwait(false);
+
+ _serverManager.SendWebSocketMessage("UserUpdated", dto);
}
/// <summary>
diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml b/MediaBrowser.ServerApplication/MainWindow.xaml
index 51f671412..330bacd35 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml
@@ -18,6 +18,8 @@
</MenuItem>
<MenuItem x:Name="cmdSwaggerApiDocs" Header="Swagger" Click="cmdSwaggerApiDocs_Click" Background="White">
</MenuItem>
+ <MenuItem x:Name="cmdGithubWiki" Header="GitHub Wiki" Click="cmdGithubWiki_Click" Background="White">
+ </MenuItem>
</MenuItem>
<Separator/>
<MenuItem x:Name="cmShowLogWindow" Header="Show Log Window" IsCheckable="True" Click="CmShowLogWindow_click"/>
diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml.cs b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
index 364dd9da6..872acea9c 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml.cs
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
@@ -184,6 +184,11 @@ namespace MediaBrowser.ServerApplication
App.OpenUrl("http://localhost:" + _configurationManager.Configuration.HttpServerPortNumber + "/" +
Kernel.Instance.WebApplicationName + "/swagger-ui/index.html");
}
+
+ void cmdGithubWiki_Click(object sender, EventArgs e)
+ {
+ App.OpenUrl("https://github.com/MediaBrowser/MediaBrowser/wiki");
+ }
/// <summary>
/// Occurs when [property changed].