Fix a couple of small autosave bugs. Fixes #42

curiousdannii · Feb 21, 2017 · ce36e36 · ce36e36
1 parent 998d1a0
commit ce36e36
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/src/zvm.js b/src/zvm.js
@@ -136,8 +136,8 @@ api = {
 				{
 					this.glk_event.push_field( this.glk_blocking_call );
 				}
-				Glk.update();
 			}
+			Glk.update()
 		}
 		catch ( e )
 		{
@@ -201,8 +201,8 @@ api = {
 				{
 					this.glk_event.push_field( this.glk_blocking_call );
 				}
-				Glk.update();
 			}
+			Glk.update()
 		}
 		catch ( e )
 		{

diff --git a/src/zvm/io.js b/src/zvm/io.js
@@ -119,7 +119,7 @@ module.exports = {
 				}
 			}
 		}
-		this.set_window( 0 );
+		this.set_window( this.io.currentwin )
 	},
 
 	erase_line: function( value )

diff --git a/src/zvm/runtime.js b/src/zvm/runtime.js
@@ -193,24 +193,29 @@ module.exports = {
 		this.xorshift_seed = snapshot.xorshift_seed
 	},
 
-	do_autosave: function()
+	do_autosave: function( save )
 	{
 		if ( !this.options.Dialog )
 		{
 			throw new Error( 'A reference to Dialog is required' )
 		}
-		const snapshot = {
-			glk: this.Glk.save_allstate(),
-			io: cloneDeep( this.io ),
-			ram: this.save_file( this.pc ),
-			read_data: cloneDeep( this.read_data ),
-			xorshift_seed: this.xorshift_seed,
+
+		let snapshot = null
+		if ( ( save || 0 ) >= 0 )
+		{
+			snapshot = {
+				glk: this.Glk.save_allstate(),
+				io: cloneDeep( this.io ),
+				ram: this.save_file( this.pc ),
+				read_data: cloneDeep( this.read_data ),
+				xorshift_seed: this.xorshift_seed,
+			}
+			delete snapshot.io.streams[2].str
+			delete snapshot.io.streams[2].str
+			delete snapshot.read_data.buffer
 		}
-		delete snapshot.io.streams[2].str
-		delete snapshot.io.streams[2].str
-		delete snapshot.read_data.buffer
 
-		this.options.Dialog.autosave_write( this.get_signature(), snapshot )
+		this.options.Dialog.autosave_write( this.signature, snapshot )
 	},
 
 	encode_text: function( zscii, length, from, target )