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

Videcommon: removed double settings (how did full/window res work so 

far?)


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4272 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-09-15 06:14:45 +00:00
parent 9f0ff64398
commit b7d6259405
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/Src/Core.cpp
View File

@ -205,6 +205,7 @@ bool Init()
emuThreadGoing.Init();
// This will execute EmuThread() further down in this file
g_EmuThread = new Common::Thread(EmuThread, NULL);
emuThreadGoing.MsgWait();
emuThreadGoing.Shutdown();

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

@ -197,8 +197,6 @@ void CCodeWindow::OnKeyDown(wxKeyEvent& event)
void CCodeWindow::OnHostMessage(wxCommandEvent& event)
{
return;
switch (event.GetId())
{
case IDM_NOTIFYMAPLOADED:
@ -388,7 +386,6 @@ void CCodeWindow::UpdateLists()
void CCodeWindow::UpdateCallstack()
{
return;
//if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) return;
//if (Core::GetState() == Core::CORE_STOPPING) return;
@ -629,7 +626,6 @@ bool CCodeWindow::JITBlockLinking()
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Toolbar
void CCodeWindow::InitBitmaps()
{
@ -670,16 +666,10 @@ void CCodeWindow::PopulateToolbar(wxAuiToolBar* toolBar)
// the changes
toolBar->Realize();
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Update GUI
void CCodeWindow::Update()
{
return;
if (!codeview) return;
codeview->Refresh();

8
Source/Core/VideoCommon/Src/VideoConfig.cpp
View File

@ -95,9 +95,9 @@ void VideoConfig::Load(const char *ini_file)
iniFile.Get("Hardware", "Adapter", &iAdapter, 0);
if (iAdapter == -1)
iAdapter = 0;
iniFile.Get("Hardware", "WindowedRes", &iWindowedRes, 0);
// iniFile.Get("Hardware", "WindowedRes", &iWindowedRes, 0);
iniFile.Get("Hardware", "VSync", &bVsync, 0);
iniFile.Get("Hardware", "FullscreenRes", &iFSResolution, 0);
// iniFile.Get("Hardware", "FullscreenRes", &iFSResolution, 0);
iniFile.Get("Hardware", "SimpleFB", &bSimpleFB, false);
// Load common settings
@ -174,9 +174,9 @@ void VideoConfig::Save(const char *ini_file)
iniFile.Set("Hacks", "ProjectionHack", iPhackvalue);
iniFile.Set("Hardware", "Adapter", iAdapter);
iniFile.Set("Hardware", "WindowedRes", iWindowedRes);
// iniFile.Set("Hardware", "WindowedRes", iWindowedRes);
iniFile.Set("Hardware", "VSync", bVsync);
iniFile.Set("Hardware", "FullscreenRes", iFSResolution);
// iniFile.Set("Hardware", "FullscreenRes", iFSResolution);
iniFile.Set("Hardware", "SimpleFB", bSimpleFB);
iniFile.Save(ini_file);