From d34f7987f1a70b8e31e6ef1d5c3f18af969d35b2 Mon Sep 17 00:00:00 2001
From: mudlord <mudlord@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Mon, 3 Dec 2007 20:55:18 +0000
Subject: [PATCH] Border fix for GB ROMs

---
 trunk/src/gb/GB.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trunk/src/gb/GB.cpp b/trunk/src/gb/GB.cpp
index 2606b39d..02584c00 100644
--- a/trunk/src/gb/GB.cpp
+++ b/trunk/src/gb/GB.cpp
@@ -2129,7 +2129,7 @@ void gbGetHardwareType()
 {
   gbCgbMode = 0;
   gbSgbMode = 0;
-  if(gbRom[0x143] & 0x80) {
+  if((gbRom[0x143] & 0x80) && !((gbRom[0x146] == 0x03) && (gbBorderAutomatic))) {
     if((gbEmulatorType == 0) ||
        gbEmulatorType == 1 ||
        gbEmulatorType == 4) {