From: Toni Wilen <twilen@winuae.net>
Date: Wed, 19 Sep 2007 15:02:03 +0000 (+0300)
Subject: imported winuaesrc1440ak.zip
X-Git-Tag: 2100~197
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=fe683c69ec6977f954b39a213ed97756a0cdeb8b;p=francis%2Fwinuae.git

imported winuaesrc1440ak.zip
---

diff --git a/filesys.c b/filesys.c
index 1ea97f85..26aa72ce 100755
--- a/filesys.c
+++ b/filesys.c
@@ -4488,8 +4488,8 @@ static int handle_packet (Unit *unit, dpacket pck)
      case ACTION_PARENT_FH: action_parent_fh (unit, pck); break;
      case ACTION_ADD_NOTIFY: action_add_notify (unit, pck); break;
      case ACTION_REMOVE_NOTIFY: action_remove_notify (unit, pck); break;
-     case ACTION_EXAMINE_ALL: return action_examine_all (unit, pck); break;
-     case ACTION_EXAMINE_ALL_END: return action_examine_all_end (unit, pck); break;
+     case ACTION_EXAMINE_ALL: return action_examine_all (unit, pck);
+     case ACTION_EXAMINE_ALL_END: return action_examine_all_end (unit, pck);
 
 	 /* unsupported packets */
      case ACTION_LOCK_RECORD:
@@ -4497,7 +4497,7 @@ static int handle_packet (Unit *unit, dpacket pck)
      case ACTION_MAKE_LINK:
      case ACTION_READ_LINK:
      case ACTION_FORMAT:
-	 return 0;
+	return 0;
      default:
 	write_log ("FILESYS: UNKNOWN PACKET %x\n", type);
 	return 0;
@@ -5942,6 +5942,8 @@ uae_u8 *save_filesys (int num, int *len)
     int type = is_hardfile (num);
 
     ui = &mountinfo.ui[num];
+    if (!ui->open)
+	return NULL;
     write_log ("FS_FILESYS: '%s' '%s'\n", ui->devname, ui->volname);
     dstbak = dst = (uae_u8*)xmalloc (100000);
     save_u32 (2); /* version */
diff --git a/od-win32/win32.c b/od-win32/win32.c
index 8b80a688..e1896231 100755
--- a/od-win32/win32.c
+++ b/od-win32/win32.c
@@ -503,11 +503,12 @@ static void setmaintitle (HWND hwnd)
 	WIN32GUI_LoadUIString (currprefs.win32_middle_mouse ? IDS_WINUAETITLE_MMB : IDS_WINUAETITLE_NORMAL,
 	    txt2, sizeof (txt2));
     }
-    if (WINUAEBETA > 0)
+    if (WINUAEBETA > 0) {
 	strcat (txt, BetaStr);
-    if (strlen(WINUAEEXTRA) > 0) {
-	strcat (txt, " ");
-	strcat (txt, WINUAEEXTRA);
+	if (strlen(WINUAEEXTRA) > 0) {
+	    strcat (txt, " ");
+	    strcat (txt, WINUAEEXTRA);
+	}
     }
     if (txt2[0]) {
 	strcat (txt, " - ");
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 7c40908f..4bfd4b9b 100755
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,10 +15,10 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEBETA 9
-#define WINUAEPUBLICBETA 1
-#define WINUAEDATE MAKEBD(2007, 9, 18)
-#define WINUAEEXTRA ""
+#define WINUAEBETA 0
+#define WINUAEPUBLICBETA 0
+#define WINUAEDATE MAKEBD(2007, 9, 20)
+#define WINUAEEXTRA "AmiKit 1.4.0 CD release"
 #define WINUAEREV ""
 
 #define IHF_WINDOWHIDDEN 6