From cccebfe4545780c5c297f1c12a4febe83da67887 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 4 Nov 2009 02:10:35 +0000
Subject: [PATCH] Fix BIOS Selector bug: BIOS list wasn't cleared when changing
 search folder.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2127 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/HwRead.cpp                       | 6 +++---
 pcsx2/gui/Panels/BiosSelectorPanel.cpp | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pcsx2/HwRead.cpp b/pcsx2/HwRead.cpp
index 8eb386b84f..9560523fd6 100644
--- a/pcsx2/HwRead.cpp
+++ b/pcsx2/HwRead.cpp
@@ -47,10 +47,10 @@ __forceinline mem8_t hwRead8(u32 mem)
 {
 	u8 ret;
 
-	if( mem >= IPU_CMD && mem < D0_CHCR ) return;
 	// TODO re-implement this warning along with a *complete* logging of all hw activity.
 	// (implementation should be modelled after thee iopHWRead/iopHwWrite files)
-	//DevCon.Warning("Unexpected hwRead8 from 0x%x", mem);
+	if( mem >= IPU_CMD && mem < D0_CHCR ) return psHu8(mem);
+	//	DevCon.Warning("Unexpected hwRead8 from 0x%x", mem);
 
 	switch (mem)
 	{
@@ -122,9 +122,9 @@ __forceinline mem16_t hwRead16(u32 mem)
 {
 	u16 ret;
 
-	if( mem >= IPU_CMD && mem < D0_CHCR ) return;
 	// TODO re-implement this warning along with a *complete* logging of all hw activity.
 	// (implementation should be modelled after thee iopHWRead/iopHwWrite files)
+	if( mem >= IPU_CMD && mem < D0_CHCR ) return psHu8(mem);
 	//	Console.Warning("Unexpected hwRead16 from 0x%x", mem);
 
 	switch (mem)
diff --git a/pcsx2/gui/Panels/BiosSelectorPanel.cpp b/pcsx2/gui/Panels/BiosSelectorPanel.cpp
index 858f92abcf..0a6ab99da0 100644
--- a/pcsx2/gui/Panels/BiosSelectorPanel.cpp
+++ b/pcsx2/gui/Panels/BiosSelectorPanel.cpp
@@ -144,6 +144,8 @@ void Panels::BiosSelectorPanel::DoRefresh()
 {
 	if( !m_BiosList ) return;
 
+	m_ComboBox.Clear();
+
 	wxFileName right( g_Conf->FullpathToBios() );
 	right.MakeAbsolute();