diff --git a/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs b/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs index 4d14b20969..af93e22bf9 100644 --- a/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs +++ b/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs @@ -165,7 +165,7 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions form.StartPosition = FormStartPosition.Manual; form.Location = position; } - var result = (owner == null ? form.ShowDialog() : form.ShowDialog(owner)); + var result = (owner == null ? form.ShowDialog(new Form() { TopMost = true }) : form.ShowDialog(owner)); GlobalWin.Sound.StartSound(); return result; } diff --git a/BizHawk.Client.EmuHawk/tools/InputPrompt.Designer.cs b/BizHawk.Client.EmuHawk/tools/InputPrompt.Designer.cs index b7ff252ac5..412e498437 100644 --- a/BizHawk.Client.EmuHawk/tools/InputPrompt.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/InputPrompt.Designer.cs @@ -95,6 +95,7 @@ this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Input Prompt"; + this.TopMost = true; this.Load += new System.EventHandler(this.InputPrompt_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/BizHawk.Client.EmuHawk/tools/InputPrompt.cs b/BizHawk.Client.EmuHawk/tools/InputPrompt.cs index 83b5c5c7f3..504981d991 100644 --- a/BizHawk.Client.EmuHawk/tools/InputPrompt.cs +++ b/BizHawk.Client.EmuHawk/tools/InputPrompt.cs @@ -15,6 +15,7 @@ namespace BizHawk.Client.EmuHawk { public InputPrompt() { + GlobalWin.Sound.StopSound(); InitializeComponent(); StartLocation = new Point(-1, -1); } @@ -60,12 +61,14 @@ namespace BizHawk.Client.EmuHawk { DialogResult = DialogResult.OK; Close(); + GlobalWin.Sound.StartSound(); } private void Cancel_Click(object sender, EventArgs e) { DialogResult = DialogResult.Cancel; Close(); + GlobalWin.Sound.StartSound(); } private void PromptBox_KeyPress(object sender, KeyPressEventArgs e) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index 06820811b2..f2cb87cc0d 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -108,6 +108,7 @@ namespace BizHawk.Client.EmuHawk else { _autosaveTimer.Stop(); + GlobalWin.Sound.StopSound(); MessageStatusLabel.Text = "Saving..."; this.Cursor = Cursors.WaitCursor; Update(); @@ -117,6 +118,7 @@ namespace BizHawk.Client.EmuHawk MessageStatusLabel.Text = CurrentTasMovie.Name + " saved."; Settings.RecentTas.Add(CurrentTasMovie.Filename); this.Cursor = Cursors.Default; + GlobalWin.Sound.StartSound(); } } @@ -131,6 +133,7 @@ namespace BizHawk.Client.EmuHawk private void SaveAsTas(object sender, EventArgs e) { _autosaveTimer.Stop(); + GlobalWin.Sound.StopSound(); ClearLeftMouseStates(); var filename = CurrentTasMovie.Filename; if (string.IsNullOrWhiteSpace(filename) || filename == DefaultTasProjName()) @@ -159,6 +162,7 @@ namespace BizHawk.Client.EmuHawk // keep insisting if (Settings.AutosaveInterval > 0) _autosaveTimer.Start(); + GlobalWin.Sound.StartSound(); } // call this one from the menu only @@ -179,6 +183,7 @@ namespace BizHawk.Client.EmuHawk else { _autosaveTimer.Stop(); + GlobalWin.Sound.StopSound(); MessageStatusLabel.Text = "Saving..."; this.Cursor = Cursors.WaitCursor; Update(); @@ -188,6 +193,7 @@ namespace BizHawk.Client.EmuHawk MessageStatusLabel.Text = "Backup .tasproj saved to \"Movie backups\" path."; Settings.RecentTas.Add(CurrentTasMovie.Filename); this.Cursor = Cursors.Default; + GlobalWin.Sound.StartSound(); } }