From 606cb80a9f9b05cbfbd87e135b6d0db4369a7369 Mon Sep 17 00:00:00 2001
From: iss <iss@>
Date: Mon, 4 Nov 2019 18:02:41 +0200
Subject: [PATCH] fix: shut function (#145)

---
 disk.c    | 9 ++++++---
 machine.c | 9 ++-------
 main.c    | 2 +-
 main.h    | 1 +
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/disk.c b/disk.c
index 638f974b..b1b79987 100644
--- a/disk.c
+++ b/disk.c
@@ -1287,8 +1287,10 @@ unsigned char microdisc_read( struct microdisc *md, unsigned short addr )
       return md->drq|0x7f;
 
     default:
-      return via_read( &md->oric->via, addr );
+      break;
   }
+
+  return via_read( &md->oric->via, addr );
 }
 
 void microdisc_write( struct microdisc *md, unsigned short addr, unsigned char data )
@@ -1396,10 +1398,11 @@ unsigned char jasmin_read( struct jasmin *j, unsigned short addr )
     case 0x3fb:
       return j->romdis;
 
-
     default:
-      return via_read( &j->oric->via, addr );
+      break;
   }
+
+  return via_read( &j->oric->via, addr );
 }
 
 void jasmin_write( struct jasmin *j, unsigned short addr, unsigned char data )
diff --git a/machine.c b/machine.c
index 70596ad9..5089150c 100644
--- a/machine.c
+++ b/machine.c
@@ -1864,11 +1864,6 @@ void shut_machine( struct machine *oric )
   mon_freesyms( &oric->tele_banksyms[7] );
 }
 
-static void shut(void)
-{
-
-}
-
 void setdrivetype( struct machine *oric, struct osdmenuitem *mitem, int type )
 {
   if( oric->drivetype == type )
@@ -1899,7 +1894,7 @@ void setdrivetype( struct machine *oric, struct osdmenuitem *mitem, int type )
   mon_state_reset( oric );
   if( !init_machine( oric, oric->type, SDL_FALSE ) )
   {
-    shut();
+    shut( oric );
     exit( EXIT_FAILURE );
   }
 
@@ -1928,7 +1923,7 @@ void swapmach( struct machine *oric, struct osdmenuitem *mitem, int which )
   mon_state_reset( oric );
   if( !init_machine( oric, which, which!=oric->type ) )
   {
-    shut();
+    shut( oric );
     exit( EXIT_FAILURE );
   }
 }
diff --git a/main.c b/main.c
index 7ffbce0c..4ec5ee76 100644
--- a/main.c
+++ b/main.c
@@ -1223,7 +1223,7 @@ SDL_bool init( struct machine *oric, int argc, char *argv[] )
   return SDL_TRUE;
 }
 
-static void shut( struct machine *oric )
+void shut( struct machine *oric )
 {
   if( vidcap ) avi_close( &vidcap );
 #if defined(DEBUG_CPU_TRACE) && DEBUG_CPU_TRACE > 0
diff --git a/main.h b/main.h
index 573da749..2a580deb 100644
--- a/main.h
+++ b/main.h
@@ -22,3 +22,4 @@ SDL_bool read_config_string( char *buf, char *token, char *dest, Sint32 maxlen )
 SDL_bool read_config_bool( char *buf, char *token, SDL_bool *dest );
 SDL_bool read_config_option( char *buf, char *token, Sint32 *dest, char **options );
 SDL_bool read_config_int( char *buf, char *token, int *dest, int min, int max );
+void shut( struct machine *oric );