themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Some more type checking on QueryScalar

Browse source
This commit is contained in:
Chris 2020-11-29 15:18:03 +10:30
parent 29170e62a6
commit ce2873fa81
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/Extensions/DbExt.cs
View file

@ -100,9 +100,12 @@ namespace TShockAPI.DB
com.AddParameter("@" + i, args[i]); com.AddParameter("@" + i, args[i]);
object output = com.ExecuteScalar(); object output = com.ExecuteScalar();
if (typeof(IConvertible).IsAssignableFrom(output.GetType())) if (output.GetType() != typeof(T))
{ {
return (T)Convert.ChangeType(output, typeof(T)); if (typeof(IConvertible).IsAssignableFrom(output.GetType()))
{
return (T)Convert.ChangeType(output, typeof(T));
}
} }
return (T)output; return (T)output;