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

Merge pull request #781 from ssakash/patch-49 

Fix Windows Lilypad local volume control GUI checkbox.
Make MicroVU E-bit delay slot warning a Dev warning.
Don't minimise GS Window if main window is minimised.
This commit is contained in:
Jonathan Li 2015-09-02 21:51:04 +01:00
parent 9929962d54 b5aceceef2
commit 288931ddc3
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/gui/AppMain.cpp
View File

@ -928,7 +928,7 @@ void Pcsx2App::OpenGsPanel()
GSFrame* gsFrame = GetGsFramePtr(); GSFrame* gsFrame = GetGsFramePtr();
if( gsFrame == NULL ) if( gsFrame == NULL )
{ {
gsFrame = new GSFrame( GetMainFramePtr(), GetAppName() ); gsFrame = new GSFrame(GetAppName() );
m_id_GsFrame = gsFrame->GetId(); m_id_GsFrame = gsFrame->GetId();
switch( wxGetApp().Overrides.GsWindowMode ) switch( wxGetApp().Overrides.GsWindowMode )

4
pcsx2/gui/FrameForGS.cpp
View File

@ -401,8 +401,8 @@ void GSPanel::OnLeftDclick(wxMouseEvent& evt)
static const uint TitleBarUpdateMs = 333; static const uint TitleBarUpdateMs = 333;
GSFrame::GSFrame(wxWindow* parent, const wxString& title) GSFrame::GSFrame( const wxString& title)
: wxFrame(parent, wxID_ANY, title, g_Conf->GSWindow.WindowPos) : wxFrame(NULL, wxID_ANY, title, g_Conf->GSWindow.WindowPos)
, m_timer_UpdateTitle( this ) , m_timer_UpdateTitle( this )
{ {
SetIcons( wxGetApp().GetIconBundle() ); SetIcons( wxGetApp().GetIconBundle() );

2
pcsx2/gui/GSFrame.h
View File

@ -95,7 +95,7 @@ protected:
CpuUsageProvider m_CpuUsage; CpuUsageProvider m_CpuUsage;
public: public:
GSFrame(wxWindow* parent, const wxString& title); GSFrame( const wxString& title);
virtual ~GSFrame() throw(); virtual ~GSFrame() throw();
GSPanel* GetViewport(); GSPanel* GetViewport();

2
pcsx2/x86/microVU_Compile.inl
View File

@ -207,7 +207,7 @@ __ri void branchWarning(mV) {
incPC(-2); incPC(-2);
if (mVUup.eBit && mVUbranch) { if (mVUup.eBit && mVUbranch) {
incPC(2); incPC(2);
Console.Error("microVU%d Warning: Branch in E-bit delay slot! [%04x]", mVU.index, xPC); DevCon.Warning("microVU%d Warning: Branch in E-bit delay slot! [%04x]", mVU.index, xPC);
mVUlow.isNOP = true; mVUlow.isNOP = true;
} }
else incPC(2); else incPC(2);

1
plugins/LilyPad/Config.cpp
View File

@ -1925,7 +1925,6 @@ INT_PTR CALLBACK GeneralDialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, L
// sound plugin plays with it. // sound plugin plays with it.
SetVolume(100); SetVolume(100);
} }
config.vistaVolume = 100;
} }
for (i=0; i<4; i++) { for (i=0; i<4; i++) {