Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 20:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

null enhance

Browse Source
This commit is contained in:
bao-qian
2017-02-13 09:38:48 +00:00
parent 0656ddd50a
commit ddb28a9b90
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Wox.Infrastructure/Storage/BinaryStorage.cs
View File

@@ -64,7 +64,7 @@ namespace Wox.Infrastructure.Storage
try try
{ {
var t = (T)binaryFormatter.Deserialize(stream); var t = ((T)binaryFormatter.Deserialize(stream)).NonNull();
return t; return t;
} }
catch (System.Exception e) catch (System.Exception e)

9
Wox.Infrastructure/Storage/JsonStorage.cs
View File

@@ -49,20 +49,25 @@ namespace Wox.Infrastructure.Storage
{ {
LoadDefault(); LoadDefault();
} }
return _data; return _data.NonNull();
} }
private void Deserialize(string searlized) private void Deserialize(string searlized)
{ {
try try
{ {
_data = JsonConvert.DeserializeObject<T>(searlized, _serializerSettings).NonNull(); _data = JsonConvert.DeserializeObject<T>(searlized, _serializerSettings);
} }
catch (JsonSerializationException e) catch (JsonSerializationException e)
{ {
LoadDefault(); LoadDefault();
Log.Exception($"|JsonStrorage.Deserialize|Deserialize error for json <{FilePath}>", e); Log.Exception($"|JsonStrorage.Deserialize|Deserialize error for json <{FilePath}>", e);
} }
if (_data == null)
{
LoadDefault();
}
} }
private void LoadDefault() private void LoadDefault()