diff --git a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp index 1761673e65..b16411d811 100644 --- a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp +++ b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp @@ -37,13 +37,15 @@ Dialogs::AboutBoxDialog::AboutBoxDialog( wxWindow* parent ) wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN ) { + // [TODO] : About box should be upgraded to use scrollable read-only text boxes. + static const wxString LabelAuthors = fromUTF8( "Arcum42, Refraction, drk||raziel, cottonvibes, gigaherz, " - "rama, Jake.Stine, saqib, Tmkk, pseudonym" + "rama, Jake.Stine, saqib, pseudonym, gregory.hainaut" "\n\n" "Previous versions: Alexey silinov, Aumatt, " "Florin, goldfinger, Linuzappz, loser, " - "Nachbrenner, shadow, Zerofrog" + "Nachbrenner, shadow, Zerofrog, tmkk" "\n\n" "Betatesting: Bositman, ChaosCode, " "CKemu, crushtest, GeneralPlot, " @@ -53,7 +55,7 @@ Dialogs::AboutBoxDialog::AboutBoxDialog( wxWindow* parent ) ); static const wxString LabelGreets = fromUTF8( - "Hiryu and Sjeep (libcdvd / iso filesystem), nneeve (fpu and vu), gregory (linux distros)" + "Hiryu and Sjeep (libcdvd / iso filesystem), nneeve (fpu and vu), n1ckname (compilation guides)" "\n\n" "Plugin Specialists: ChickenLiver (Lilypad), Efp (efp), " "Gabest (Gsdx, Cdvdolio, Xpad), Zeydlitz (ZZogl)" diff --git a/pcsx2/gui/SysState.cpp b/pcsx2/gui/SysState.cpp index 80813c4a71..6aef6735dc 100644 --- a/pcsx2/gui/SysState.cpp +++ b/pcsx2/gui/SysState.cpp @@ -434,7 +434,7 @@ protected: // the emulator/vm thread. Sleeping the executor thread briefly before doing file // transactions should help reduce overhead. --air - Yield(4); + pxYield(4); // Write the version and screenshot: ScopedPtr out( new pxOutputStream(tempfile, new wxZipOutputStream(woot)) );