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

fix #537 Annoyance with "always on top"

This commit is contained in:
zeromus 2015-11-12 17:32:49 -06:00
parent f0e93ce80d
commit 53eae133e7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
View File

@ -157,10 +157,10 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions
/// <summary> /// <summary>
/// Handles EmuHawk specific issues before showing a modal dialog /// Handles EmuHawk specific issues before showing a modal dialog
/// </summary> /// </summary>
public static DialogResult ShowHawkDialog(this Form form) public static DialogResult ShowHawkDialog(this Form form, IWin32Window owner = null)
{ {
GlobalWin.Sound.StopSound(); GlobalWin.Sound.StopSound();
var result = form.ShowDialog(); var result = (owner == null ? form.ShowDialog() : form.ShowDialog(owner));
GlobalWin.Sound.StartSound(); GlobalWin.Sound.StartSound();
return result; return result;
} }

2
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
View File

@ -756,7 +756,7 @@ namespace BizHawk.Client.EmuHawk
MemoryDomains = _memoryDomains MemoryDomains = _memoryDomains
}; };
we.SetWatch(_watches.Domain); we.SetWatch(_watches.Domain);
we.ShowHawkDialog(); we.ShowHawkDialog(this);
if (we.DialogResult == DialogResult.OK) if (we.DialogResult == DialogResult.OK)
{ {
_watches.Add(we.Watches[0]); _watches.Add(we.Watches[0]);