[fuse-emulator-cvs] [fuse] branch master updated: Don't abort if the Timex cartridge is not found

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/b0fff7d48b4342400ebf54d05926515038629b49/

The following commit(s) were added to refs/heads/master by this push:
     new b0fff7d4 Don't abort if the Timex cartridge is not found
b0fff7d4 is described below

commit b0fff7d48b4342400ebf54d05926515038629b49
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Wed Mar 17 21:48:26 2021 +1100

    Don't abort if the Timex cartridge is not found
    
    (fixes bug #468) (Alberto Garcia and Fredrick Meunier).
---
 ChangeLog         | 8 ++++++++
 machines/tc2068.c | 1 +
 machines/ts2068.c | 1 +
 peripherals/dck.c | 3 +--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44ef32a9..b13c8570 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-??-??  Philip Kendall  <phi...@sh...>
+
+        * Fuse 1.?.? released.
+
+        * UI improvements:
+         * Timex: don't abort if the Timex dock cartridge image is not
+           found (Alberto Garcia).
+
 2021-02-27  Philip Kendall  <phi...@sh...>
 
         * Fuse 1.6.0 released.
diff --git a/machines/tc2068.c b/machines/tc2068.c
index e36127b2..5a876c20 100644
--- a/machines/tc2068.c
+++ b/machines/tc2068.c
@@ -178,6 +178,7 @@ tc2068_reset( void )
   if( error ) {
     ui_error( UI_ERROR_INFO, "Ignoring Timex dock file '%s'",
             settings_current.dck_file );
+    dck_eject();
   }
 
   return 0;
diff --git a/machines/ts2068.c b/machines/ts2068.c
index 94eb295b..dc105874 100644
--- a/machines/ts2068.c
+++ b/machines/ts2068.c
@@ -117,6 +117,7 @@ ts2068_reset( void )
   if( error ) {
     ui_error( UI_ERROR_INFO, "Ignoring Timex dock file '%s'",
             settings_current.dck_file );
+    dck_eject();
   }
 
   return 0;
diff --git a/peripherals/dck.c b/peripherals/dck.c
index 0a31c2fc..7e9698c9 100644
--- a/peripherals/dck.c
+++ b/peripherals/dck.c
@@ -71,8 +71,7 @@ dck_eject( void )
     return;
   }
 
-  if( settings_current.dck_file ) libspectrum_free( settings_current.dck_file );
-  settings_current.dck_file = NULL;
+  settings_set_string( &settings_current.dck_file, NULL );
 
   dck_active = 0;