Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue with shortcuts pointing to a network share

Browse Source
This commit is contained in:
LukePulverenti Luke Pulverenti luke pulverenti 2012-09-07 15:08:32 -04:00
parent 90c609c159
commit 24d221709d
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MediaBrowser.Controller/IO/FileData.cs
View File

@ -1,4 +1,5 @@
using System; using MediaBrowser.Common.Logging;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -12,6 +13,7 @@ namespace MediaBrowser.Controller.IO
{ {
public const int MAX_PATH = 260; public const int MAX_PATH = 260;
public const int MAX_ALTERNATE = 14; public const int MAX_ALTERNATE = 14;
public static IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);
/// <summary> /// <summary>
/// Gets information about a path /// Gets information about a path
@ -20,8 +22,21 @@ namespace MediaBrowser.Controller.IO
{ {
WIN32_FIND_DATA data; WIN32_FIND_DATA data;
IntPtr handle = FindFirstFile(path, out data); IntPtr handle = FindFirstFile(path, out data);
if (handle == INVALID_HANDLE_VALUE && !Path.HasExtension(path))
{
Logger.LogInfo("Handle came back invalid for {0}. Since this is a directory we'll try appending \\*.", path);
FindClose(handle);
handle = FindFirstFile(Path.Combine(path, "*"), out data);
}
if (handle == IntPtr.Zero) if (handle == IntPtr.Zero)
{
throw new IOException("FindFirstFile failed"); throw new IOException("FindFirstFile failed");
}
FindClose(handle); FindClose(handle);
data.Path = path; data.Path = path;

2
MediaBrowser.Controller/Kernel.cs
View File

@ -217,7 +217,7 @@ namespace MediaBrowser.Controller
} }
else else
{ {
result.Success = GetMD5(password).Equals(user.Password); result.Success = GetMD5((password ?? string.Empty)).Equals(user.Password);
// Update LastActivityDate and LastLoginDate, then save // Update LastActivityDate and LastLoginDate, then save
if (result.Success) if (result.Success)