diff --git a/MediaBrowser.Api/Library/LibraryStructureService.cs b/MediaBrowser.Api/Library/LibraryStructureService.cs
index 96af5240ef..76abfb7435 100644
--- a/MediaBrowser.Api/Library/LibraryStructureService.cs
+++ b/MediaBrowser.Api/Library/LibraryStructureService.cs
@@ -204,9 +204,17 @@ namespace MediaBrowser.Api.Library
if (_fileSystem.DirectoryExists(virtualFolderPath))
{
- throw new ArgumentException("There is already a media collection with the name " + name + ".");
+ throw new ArgumentException("There is already a media library with the name " + name + ".");
}
+ if (!string.IsNullOrWhiteSpace(request.Path))
+ {
+ if (!_fileSystem.DirectoryExists(request.Path))
+ {
+ throw new DirectoryNotFoundException("The specified folder does not exist.");
+ }
+ }
+
_libraryMonitor.Stop();
try
diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
index 3383cc6be4..e9a7d59857 100644
--- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
+++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
@@ -132,13 +132,6 @@ namespace MediaBrowser.ServerApplication
LocalizeText();
- if (_appHost.IsFirstRun)
- {
- Action action = () => notifyIcon1.ShowBalloonTip(5000, "Emby", "Welcome to Emby Server!", ToolTipIcon.Info);
-
- contextMenuStrip1.Invoke(action);
- }
-
notifyIcon1.DoubleClick += notifyIcon1_DoubleClick;
Application.ApplicationExit += Application_ApplicationExit;
}
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index d6754f5971..1d7e66f60a 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -206,6 +206,12 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest