From 34b1a16b6d497a7aa18617a825c00be672840de7 Mon Sep 17 00:00:00 2001
From: maron2000 <68574602+maron2000@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:30:50 +0900
Subject: [PATCH 1/2] Fix crash when changing floppies mounted by drive numbers
 on a booted guest

---
 src/dos/drive_fat.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dos/drive_fat.cpp b/src/dos/drive_fat.cpp
index 2f51e1999e..be7e2c9c0e 100644
--- a/src/dos/drive_fat.cpp
+++ b/src/dos/drive_fat.cpp
@@ -58,6 +58,7 @@ extern bool CodePageGuestToHostUTF16(uint16_t *d/*CROSS_LEN*/,const char *s/*CRO
 extern bool CodePageHostToGuestUTF16(char *d/*CROSS_LEN*/,const uint16_t *s/*CROSS_LEN*/);
 extern bool wild_match(const char* haystack, char* needle);
 bool systemmessagebox(char const * aTitle, char const * aMessage, char const * aDialogType, char const * aIconType, int aDefaultButton);
+extern bool dos_kernel_disabled;
 
 int PC98AutoChoose_FAT(const std::vector<_PC98RawPartition> &parts,imageDisk *loadedDisk) {
         for (size_t i=0;i < parts.size();i++) {
@@ -1343,7 +1344,7 @@ fatDrive::fatDrive(const char* sysFilename, uint32_t bytesector, uint32_t cylsec
 	uint32_t filesize;
 	unsigned char bootcode[256];
 
-	if(imgDTASeg == 0) {
+	if(!dos_kernel_disabled && imgDTASeg == 0) {
 		imgDTASeg = DOS_GetMemory(4,"imgDTASeg");
 		imgDTAPtr = RealMake(imgDTASeg, 0);
 		imgDTA    = new DOS_DTA(imgDTAPtr);

From df6e6dfd98fef6dd740215a1d826ff82ed3ddfc6 Mon Sep 17 00:00:00 2001
From: maron2000 <68574602+maron2000@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:44:00 +0900
Subject: [PATCH 2/2] Update CHANGELOG

---
 CHANGELOG | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 878c1f5eb4..e451191355 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,10 @@
 Next
+  - Fixed crashes when changing floppies mounted by drive numbers on
+    a booted guest OS (maron2000)
+  - Fixed launching host programs with white spaces in path (Windows)
+    (maron2000)
+  - Convert paths from relative to absolute when launching host programs
+    in a mounted drive (Windows) (maron2000) 
   - Added an option not to pause after host program execution is 
     completed (maron2000)
   - Fixed corrupted display when loading language files at launch