mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-02 02:52:30 +02:00
Remember last iso (fix)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1937 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
80116f4966
commit
015fc11baf
@ -280,7 +280,7 @@ THREAD_RETURN CpuThread(void *pArg)
|
||||
THREAD_RETURN EmuThread(void *pArg)
|
||||
{
|
||||
Common::SetCurrentThreadName("Emuthread - starting");
|
||||
const SCoreStartupParameter _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
|
||||
const SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
|
||||
|
||||
CPluginManager &Plugins = CPluginManager::GetInstance();
|
||||
if (_CoreParameter.bLockThreads)
|
||||
@ -306,7 +306,7 @@ THREAD_RETURN EmuThread(void *pArg)
|
||||
VideoInitialize.pCopiedToXFB = Callback_VideoCopiedToXFB;
|
||||
VideoInitialize.pVIRegs = VideoInterface::m_UVIUnknownRegs;
|
||||
VideoInitialize.pPeekMessages = NULL;
|
||||
VideoInitialize.pUpdateFPSDisplay = NULL;
|
||||
VideoInitialize.pUpdateFPSDisplay = NULL;
|
||||
VideoInitialize.pCPFifo = (SCPFifoStruct*)&CommandProcessor::fifo;
|
||||
VideoInitialize.pUpdateInterrupts = &(CommandProcessor::UpdateInterruptsFromVideoPlugin);
|
||||
VideoInitialize.pMemoryBase = Memory::base;
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#define MAXPADS 1
|
||||
#define MAXPADS 4
|
||||
#define MAXWIIMOTES 1
|
||||
|
||||
struct SCoreStartupParameter
|
||||
|
@ -112,9 +112,9 @@ bool BootCore(const std::string& _rFilename)
|
||||
|
||||
StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
|
||||
StartUp.m_strFilename = _rFilename;
|
||||
SConfig::GetInstance().m_LastFilename = _rFilename;
|
||||
StartUp.bRunCompareClient = false;
|
||||
StartUp.bRunCompareServer = false;
|
||||
std::string BaseDataPath;
|
||||
|
||||
#ifdef _WIN32
|
||||
StartUp.hInstance = wxGetInstance();
|
||||
|
Loading…
Reference in New Issue
Block a user