Tasproj loading - don't attempt to read from empty files if they exist but are empty
This commit is contained in:
parent
5a893c1a43
commit
2041b15260
|
@ -85,10 +85,13 @@ namespace BizHawk.Client.Common
|
||||||
public void Load(BinaryReader br)
|
public void Load(BinaryReader br)
|
||||||
{
|
{
|
||||||
LagLog.Clear();
|
LagLog.Clear();
|
||||||
int length = br.ReadInt32();
|
if (br.BaseStream.Length > 0)
|
||||||
for (int i = 0; i < length; i++)
|
|
||||||
{
|
{
|
||||||
LagLog.Add(br.ReadInt32(), br.ReadBoolean());
|
int length = br.ReadInt32();
|
||||||
|
for (int i = 0; i < length; i++)
|
||||||
|
{
|
||||||
|
LagLog.Add(br.ReadInt32(), br.ReadBoolean());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -229,14 +229,17 @@ namespace BizHawk.Client.Common
|
||||||
public void Load(BinaryReader br)
|
public void Load(BinaryReader br)
|
||||||
{
|
{
|
||||||
States.Clear();
|
States.Clear();
|
||||||
int nstates = br.ReadInt32();
|
if (br.BaseStream.Length > 0)
|
||||||
for (int i = 0; i < nstates; i++)
|
|
||||||
{
|
{
|
||||||
int frame = br.ReadInt32();
|
int nstates = br.ReadInt32();
|
||||||
int len = br.ReadInt32();
|
for (int i = 0; i < nstates; i++)
|
||||||
byte[] data = br.ReadBytes(len);
|
{
|
||||||
States.Add(frame, data);
|
int frame = br.ReadInt32();
|
||||||
Used += len;
|
int len = br.ReadInt32();
|
||||||
|
byte[] data = br.ReadBytes(len);
|
||||||
|
States.Add(frame, data);
|
||||||
|
Used += len;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -53,9 +53,12 @@ namespace BizHawk.Client.Common
|
||||||
|
|
||||||
public void PopulateFromString(string settings)
|
public void PopulateFromString(string settings)
|
||||||
{
|
{
|
||||||
var lines = settings.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
|
if (!string.IsNullOrWhiteSpace(settings))
|
||||||
SaveGreenzone = bool.Parse(lines[0]);
|
{
|
||||||
Capacitymb = int.Parse(lines[1]);
|
var lines = settings.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
|
SaveGreenzone = bool.Parse(lines[0]);
|
||||||
|
Capacitymb = int.Parse(lines[1]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue