ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

oops, fix database loading

This commit is contained in:
zeromus 2020-06-07 18:43:04 -05:00
parent 82c6efd274
commit 93f06f2a68
1 changed files with 6 additions and 5 deletions
src/BizHawk.Emulation.Common/Database
Database.cs

11
src/BizHawk.Emulation.Common/Database/Database.cs
View File

@ -45,7 +45,7 @@ namespace BizHawk.Emulation.Common
if (File.Exists(filename))
{
Debug.WriteLine("loading external game database {0}", line);
InitializeDatabase(filename);
initializeWork(filename);
}
else
{
@ -92,7 +92,6 @@ namespace BizHawk.Emulation.Common
{
//reminder: this COULD be done on several threads, if it takes even longer
Dictionary<string, CompactGameInfo> db = new Dictionary<string, CompactGameInfo>();
var stopwatch = Stopwatch.StartNew();
using var reader = new StreamReader(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read));
while (reader.EndOfStream == false)
@ -161,8 +160,6 @@ namespace BizHawk.Emulation.Common
//it's left as null until now to help catch mistakes in using the resource
DB = db;
acquire.Set();
Console.WriteLine("GameDB load: " + stopwatch.Elapsed + " sec");
}
public static void InitializeDatabase(string path)
@ -170,7 +167,11 @@ namespace BizHawk.Emulation.Common
if (initialized) throw new InvalidOperationException("Did not expect re-initialize of game Database");
initialized = true;
ThreadPool.QueueUserWorkItem(_=>initializeWork(path));
var stopwatch = Stopwatch.StartNew();
ThreadPool.QueueUserWorkItem(_=> {
initializeWork(path);
Console.WriteLine("GameDB load: " + stopwatch.Elapsed + " sec");
});
}
public static GameInfo CheckDatabase(string hash)