From 180efd8e44cdff4cbe605c59ddbd0e153e4f8330 Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 1 Jan 2014 19:07:23 +0000 Subject: [PATCH] Run Tools.AskSave() before attempting to load a rom, and back out of that action if the user cancels --- BizHawk.Client.EmuHawk/MainForm.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index c327fb53bd..53658657ce 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -2940,6 +2940,11 @@ namespace BizHawk.Client.EmuHawk // Still needs a good bit of refactoring public bool LoadRom(string path, bool deterministicemulation = false, bool hasmovie = false) { + if (!GlobalWin.Tools.AskSave()) + { + return false; + } + var loader = new RomLoader { ChooseArchive = LoadArhiveChooser,