summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorNeoBrainX <NeoBrainX@gmail.com>2013-04-29 21:30:14 +0200
committerNeoBrainX <NeoBrainX@gmail.com>2013-04-29 21:32:13 +0200
commit76a316ffab7c8a23bb70669d5b7a2b701f4093ba (patch)
tree32727904b4fb5a8dd29abe45bda624bc25ebfab1 /Source
parent8dbe2366063f74b3f15dcdf18dcaea91e4bb1a61 (diff)
Don't exit when bluetooth support is not available on Windows.
Fixes running Dolphin in Wine and on regular Windows setups where bthprops.cpl is not available. Fixes issue 6283.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index aa5b022a44..4aae05fa3a 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -87,8 +87,8 @@ inline void init_lib()
hid_lib = LoadLibrary(_T("hid.dll"));
if (!hid_lib)
{
- PanicAlertT("Failed to load hid.dll");
- exit(EXIT_FAILURE);
+ PanicAlertT("Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin might crash unexpectedly!");
+ return;
}
HidD_GetHidGuid = (PHidD_GetHidGuid)GetProcAddress(hid_lib, "HidD_GetHidGuid");
@@ -98,15 +98,15 @@ inline void init_lib()
if (!HidD_GetHidGuid || !HidD_GetAttributes ||
!HidD_SetOutputReport || !HidD_GetProductString)
{
- PanicAlertT("Failed to load hid.dll");
- exit(EXIT_FAILURE);
+ PanicAlertT("Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin might crash unexpectedly!");
+ return;
}
bthprops_lib = LoadLibrary(_T("bthprops.cpl"));
if (!bthprops_lib)
{
- PanicAlertT("Failed to load bthprops.cpl");
- exit(EXIT_FAILURE);
+ PanicAlertT("Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin might crash unexpectedly!");
+ return;
}
Bth_BluetoothFindDeviceClose = (PBth_BluetoothFindDeviceClose)GetProcAddress(bthprops_lib, "BluetoothFindDeviceClose");
@@ -128,8 +128,8 @@ inline void init_lib()
!Bth_BluetoothSetServiceState || !Bth_BluetoothAuthenticateDevice ||
!Bth_BluetoothEnumerateInstalledServices)
{
- PanicAlertT("Failed to load bthprops.cpl");
- exit(EXIT_FAILURE);
+ PanicAlertT("Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin might crash unexpectedly!");
+ return;
}
initialized = true;