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

MultiHawk: Make unreachable code in Mainform ctor reachable again. 

This corrects a merge error from
0b4fc8b6a5 that was incorrectly fixed in
20fb060c65.
This commit is contained in:
Admiral H. Curtiss 2017-03-04 16:07:36 +01:00
parent 0960ca8a89
commit e5f85bbd8f
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.MultiHawk/Mainform.cs
View File

@ -74,6 +74,7 @@ namespace BizHawk.Client.MultiHawk
return NesCartFile return NesCartFile
.GetStream() .GetStream()
.ReadAllBytes(); .ReadAllBytes();
}
}; };
Database.LoadDatabase(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "gamedb.txt")); Database.LoadDatabase(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "gamedb.txt"));
@ -104,7 +105,6 @@ namespace BizHawk.Client.MultiHawk
{ {
Location = new Point(Global.Config.MainWndx, Global.Config.MainWndy); Location = new Point(Global.Config.MainWndx, Global.Config.MainWndy);
} }
};
} }
// TODO: make this an actual property, set it when loading a Rom, and pass it dialogs, etc // TODO: make this an actual property, set it when loading a Rom, and pass it dialogs, etc