piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 13:57:57 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change disc: Warn the user if he's changing the disc to a completely different game

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1634 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2008-12-23 09:33:02 +00:00
parent 2852d1b84f
commit 8cc09ef74d
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DebuggerWX/Src/CodeWindow.cpp
View File

@ -1163,9 +1163,11 @@ void CCodeWindow::OnHostMessage(wxCommandEvent& event)
case IDM_UPDATESTATUSBAR:
//if (main_frame->m_pStatusBar != NULL)
{
PanicAlert("");
// What is this PanicAlert() for?
//PanicAlert("");
//this->GetParent()->m_p
//this->GetParent()->
//this->GetParent()->
//parent->m_pStatusBar->SetStatusText(wxT("Hi"), 0);
//m_pStatusBar->SetStatusText(event.GetString(), event.GetInt());
//this->GetParent()->m_pStatusBar->SetStatusText(event.GetString(), event.GetInt());

2
Source/Core/DolphinWX/Src/BootManager.cpp
View File

@ -179,7 +179,7 @@ bool BootCore(const std::string& _rFilename)
// Save some values to our local version of SCoreStartupParameter
SConfig::GetInstance().m_LocalCoreStartupParameter.bWii = StartUp.bWii;
SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSC = StartUp.bNTSC;
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID = StartUp.m_strUniqueID;
#if defined(HAVE_WX) && HAVE_WX
if(main_frame)

18
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -388,10 +388,24 @@ void CFrame::DoOpen(bool Boot)
// Put back the old one
VolumeHandler::SetVolumeName(OldName);
}
}
// Yes it is a valid ISO file
else
{
// Save the current ISO file name
std::string OldID = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID;
std::string NewID = VolumeHandler::GetVolume()->GetUniqueID();
// Warn the user if he's selecting a completely different game
if(OldID != NewID)
wxMessageBox(wxString::Format(
"The new game ID '%s' is not the same as the old game ID '%s'."
" It is not recommended that you change the disc to another game this way."
" It may crash your game. If you want to play another game you"
" have to Stop this game and Start a new game."
, NewID.c_str(), OldID.c_str())
);
// Save the new ISO file name
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename = std::string(path.ToAscii());
}
}