summaryrefslogtreecommitdiff
path: root/platform/windows
diff options
context:
space:
mode:
Diffstat (limited to 'platform/windows')
-rw-r--r--platform/windows/joypad_windows.cpp3
-rw-r--r--platform/windows/os_windows.cpp3
2 files changed, 5 insertions, 1 deletions
diff --git a/platform/windows/joypad_windows.cpp b/platform/windows/joypad_windows.cpp
index 0cff12ca8c..50f090d2b0 100644
--- a/platform/windows/joypad_windows.cpp
+++ b/platform/windows/joypad_windows.cpp
@@ -70,7 +70,8 @@ JoypadWindows::JoypadWindows(HWND *hwnd) {
HRESULT result;
result = DirectInput8Create(GetModuleHandle(nullptr), DIRECTINPUT_VERSION, IID_IDirectInput8, (void **)&dinput, nullptr);
if (FAILED(result)) {
- printf("failed init DINPUT: %ld\n", result);
+ printf("Couldn't initialize DirectInput: %ld\n", result);
+ printf("Rebooting your PC may solve this issue.\n");
}
probe_joypads();
}
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index f11888b26c..0dab0c601a 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -795,6 +795,9 @@ String OS_Windows::get_current_tablet_driver() const {
}
void OS_Windows::set_current_tablet_driver(const String &p_driver) {
+ if (get_tablet_driver_count() == 0) {
+ return;
+ }
bool found = false;
for (int i = 0; i < get_tablet_driver_count(); i++) {
if (p_driver == get_tablet_driver_name(i)) {