From f238be27e8e8d24c0ef4bf487826f5d4da326fcb Mon Sep 17 00:00:00 2001
From: tomcw <tomcw@users.noreply.github.com>
Date: Wed, 3 Jun 2020 20:26:06 +0100
Subject: [PATCH] Use SetCursor() to busy when loading state file. (Fixes #781)
 Fixed typos in dbg-bookmarks.html.

---
 bin/History.txt         | 1 +
 help/dbg-bookmarks.html | 6 +++---
 source/SaveState.cpp    | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/bin/History.txt b/bin/History.txt
index 8ab500cd..ac548195 100644
--- a/bin/History.txt
+++ b/bin/History.txt
@@ -19,6 +19,7 @@ Tom Charlesworth
 	instead of 'LDA DATASTROBE,X'. So now perhaps less helpful when stepping Disk II code.
 . [PR #785] Debugger: Improvements to Bookmarks.
 	- AppleWin.chm: Added debugger help about Bookmarks.
+. Fixed occasional speaker clicks in full-speed mode.
 
 
 1.29.12.0 - 26 Apr 2020
diff --git a/help/dbg-bookmarks.html b/help/dbg-bookmarks.html
index d8573931..6ddd81e5 100644
--- a/help/dbg-bookmarks.html
+++ b/help/dbg-bookmarks.html
@@ -7,7 +7,7 @@
 	<body style="DIRECTION: ltr" lang="en-US">
 		<h1>Bookmarks</h1>
 		<p>Bookmarks allow you to "tag" an address and consequently jump back to them.<br>
-		They appear as a number with a circle around them between address and opcodes are listed (where the : separator is).
+		They appear as a number with a circle around them between where address and opcodes are listed (where the : separator is).
 		</p>
 		
 		<img src="img/debugger-bookmarks-annotated.png" hspace="5" vspace="5">
@@ -15,7 +15,7 @@
 		<br>
 		<p><font size="4"><b>Notes</b>:</font></p>
 		<ul>
-			<li>Set a bookmark a the current disassembly cursor, use Ctrl-Shift-#, ie:
+			<li>Set a bookmark at the current disassembly cursor, use Ctrl-Shift-#, ie:
 			<ul>
 				<li>NB. Ctrl-Shift-0 can't be used, as it's not recognised by Windows
 				<li>Ctrl-Shift-1 set bookmark 1
@@ -27,7 +27,7 @@
 
 			<br>
 
-			<li>To jump to a existing bookmark, if it exists, press Ctrl-#, ie:
+			<li>To jump to an existing bookmark, if it exists, press Ctrl-#, ie:
 			<ul>
 				<li>Ctrl-0 to jump to bookmark 0
 				<li>Ctrl-1 to jump to bookmark 1
diff --git a/source/SaveState.cpp b/source/SaveState.cpp
index 7d1de8a2..0e1dc5f3 100644
--- a/source/SaveState.cpp
+++ b/source/SaveState.cpp
@@ -371,6 +371,7 @@ static void ParseUnit(void)
 static void Snapshot_LoadState_v2(void)
 {
 	bool restart = false;	// Only need to restart if any VM state has change
+	HCURSOR oldcursor = SetCursor(LoadCursor(0,IDC_WAIT));
 
 	try
 	{
@@ -474,6 +475,7 @@ static void Snapshot_LoadState_v2(void)
 			PostMessage(g_hFrameWindow, WM_USER_RESTART, 0, 0);		// Power-cycle VM (undoing all the new state just loaded)
 	}
 
+	SetCursor(oldcursor);
 	yamlHelper.FinaliseParser();
 }
 
