Don't enable KS 1.2 hack if boot rom force-enabled but no harddrives mounted.

diff --git a/filesys.cpp b/filesys.cpp
index d30ae45ea2928750c2f5a5a6741a9e429b544e59..6c14a460ef464f3250434fa4034ae4cbef3afef1 100644 (file)
--- a/filesys.cpp
+++ b/filesys.cpp
@@ -7387,13 +7387,15 @@ static uae_u32 REGPARAM2 filesys_diagentry (TrapContext *ctx)
                resaddr += 0x10;
        }
 
-       put_long_host(baseaddr + 0x2100, EXPANSION_explibname);
-       put_long_host(baseaddr + 0x2104, filesys_configdev);
-       put_long_host(baseaddr + 0x2108, EXPANSION_doslibname);
-       put_word_host(baseaddr + 0x210c, 0);
-       put_word_host(baseaddr + 0x210e, nr_units());
-       put_word_host(baseaddr + 0x2110, 0);
-       put_word_host(baseaddr + 0x2112, 1 | (currprefs.uae_hide_autoconfig || currprefs.uaeboard > 1 ? 16 : 0));
+       if (baseaddr) {
+               put_long_host(baseaddr + 0x2100, EXPANSION_explibname);
+               put_long_host(baseaddr + 0x2104, filesys_configdev);
+               put_long_host(baseaddr + 0x2108, EXPANSION_doslibname);
+               put_word_host(baseaddr + 0x210c, 0);
+               put_word_host(baseaddr + 0x210e, nr_units());
+               put_word_host(baseaddr + 0x2110, 0);
+               put_word_host(baseaddr + 0x2112, 1 | (currprefs.uae_hide_autoconfig || currprefs.uaeboard > 1 ? 16 : 0));
+       }
 
        native2amiga_startup();
 
@@ -7484,7 +7486,7 @@ static uae_u32 REGPARAM2 filesys_diagentry (TrapContext *ctx)
        putmsg_hack_filesystemtask = 0;
        ks12hack_deviceproc = 0;
 
-       if (KS12_BOOT_HACK && nr_units() && filesys_configdev == 0) {
+       if (KS12_BOOT_HACK && nr_units() && filesys_configdev == 0 && baseaddr) {
                resaddr_hack = resaddr;
                putmsg_hack_state = -1;
                if (uip[0].bootpri > -128) {