Merge remote-tracking branch 'origin/master' into HEAD

This commit is contained in:
2020-09-11 17:06:07 +08:00

View File

@@ -197,16 +197,16 @@ namespace hgl
if(len==0) if(len==0)
return false; return false;
dir=new u16char[len+1]; dir=new u16char[len]; //不用+1
if(GetCurrentDirectoryW(len,dir)) if(GetCurrentDirectoryW(len,dir))
{ {
if(len==3&&dir[1]==OS_TEXT(':')) if(len==3&&dir[1]==OS_TEXT(':'))
len=2; //如果是"C:\"这种情况,去掉"\" len=2; //如果是"C:\"这种情况,去掉"\"
dir[len]=0; dir[len-1]=0;
path.Set(dir,len,true); path.SetInstance(dir,len-1);
return(true); return(true);
} }