ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only complain about not having a bios if we don't have a bios. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3074 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-05-25 07:04:57 +00:00
parent ef8039ed1d
commit 321b341030
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcsx2/gui/Panels/BiosSelectorPanel.cpp
View File

@ -94,7 +94,7 @@ Panels::BiosSelectorPanel::BiosSelectorPanel( wxWindow* parent, int idealWidth )
m_ComboBox->SetFont( wxFont( m_ComboBox->GetFont().GetPointSize()+1, wxFONTFAMILY_MODERN, wxNORMAL, wxNORMAL, false, L"Lucida Console" ) ); m_ComboBox->SetFont( wxFont( m_ComboBox->GetFont().GetPointSize()+1, wxFONTFAMILY_MODERN, wxNORMAL, wxNORMAL, false, L"Lucida Console" ) );
m_ComboBox->SetMinSize( wxSize( wxDefaultCoord, std::max( m_ComboBox->GetMinSize().GetHeight(), 96 ) ) ); m_ComboBox->SetMinSize( wxSize( wxDefaultCoord, std::max( m_ComboBox->GetMinSize().GetHeight(), 96 ) ) );
m_FolderPicker->SetStaticDesc( _("Click the Browse button to select a different folder where PCSX2 will look for PS2 BIOS roms.") ); m_FolderPicker->SetStaticDesc( _("Click the Browse button to select a different folder where PCSX2 will look for PS2 BIOS roms.") );
wxButton* refreshButton = new wxButton( this, wxID_ANY, _("Refresh list") ); wxButton* refreshButton = new wxButton( this, wxID_ANY, _("Refresh list") );
@ -117,6 +117,9 @@ void Panels::BiosSelectorPanel::Apply()
int sel = m_ComboBox->GetSelection(); int sel = m_ComboBox->GetSelection();
if( sel == wxNOT_FOUND ) if( sel == wxNOT_FOUND )
{ {
// If we already have a bios, lets not worry about it.
if (g_Conf->BaseFilenames.Bios.IsOk() && wxFileName::FileExists(g_Conf->BaseFilenames.Bios.GetFullPath()) && !g_Conf->BaseFilenames.Bios.IsDir()) return;
throw Exception::CannotApplySettings( this, throw Exception::CannotApplySettings( this,
// English Log // English Log
L"User did not specify a valid BIOS selection.", L"User did not specify a valid BIOS selection.",

2
plugins/spu2-x/src/Linux/CfgHelpers.cpp
View File

@ -18,7 +18,6 @@
#include "Dialogs.h" #include "Dialogs.h"
#include <wx/fileconf.h> #include <wx/fileconf.h>
wxConfigBase *oldConfig;
wxFileConfig *spuConfig; wxFileConfig *spuConfig;
wxString path(L"~/.pcsx2/inis/spu2-x.ini"); wxString path(L"~/.pcsx2/inis/spu2-x.ini");
bool pathSet = false; bool pathSet = false;
@ -39,7 +38,6 @@ void CfgSetSettingsDir(const char* dir)
FileLog("CfgSetSettingsDir(%s)\n", dir); FileLog("CfgSetSettingsDir(%s)\n", dir);
path = wxString::FromAscii(dir) + L"/spu2-x.ini"; path = wxString::FromAscii(dir) + L"/spu2-x.ini";
pathSet = true; pathSet = true;
//initIni();
} }
void CfgWriteBool(const wchar_t* Section, const wchar_t* Name, bool Value) void CfgWriteBool(const wchar_t* Section, const wchar_t* Name, bool Value)