Merge branch 'master' into wii-usb

This commit is contained in:
Matthew Parlane 2012-12-31 15:53:12 +13:00
commit 4f280d1ad8
1 changed files with 17 additions and 0 deletions

View File

@ -45,6 +45,10 @@
#include <wx/intl.h>
#ifdef _WIN32
#include <shellapi.h>
#endif
// Nvidia drivers >= v302 will check if the application exports a global
// variable named NvOptimusEnablement to know if it should run the app in high
// performance graphics mode or using the IGP.
@ -264,6 +268,19 @@ bool DolphinApp::OnInit()
int w = SConfig::GetInstance().m_LocalCoreStartupParameter.iWidth;
int h = SConfig::GetInstance().m_LocalCoreStartupParameter.iHeight;
#ifdef _WIN32
if (File::Exists("www.dolphin-emulator.com.txt"))
{
File::Delete("www.dolphin-emulator.com.txt");
MessageBox(NULL,
L"This version of Dolphin was downloaded from a website stealing money from developers of the emulator. Please "
L"download Dolphin from the official website instead: http://dolphin-emu.org/",
L"Unofficial version detected", MB_OK | MB_ICONWARNING);
ShellExecute(NULL, L"open", L"http://dolphin-emu.org/?ref=badver", NULL, NULL, SW_SHOWDEFAULT);
exit(0);
}
#endif
// The following is not needed with X11, where window managers
// do not allow windows to be created off the desktop.
#ifdef _WIN32