piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 23:59:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13822 from jordan-woyak/libusb-init-error

Browse Source 
LibusbUtils: Change libusb_init failure from an ASSERT_MSG to an ERROR_LOG_FMT
This commit is contained in:
Admiral H. Curtiss
2025-07-25 00:20:34 +02:00
committed by GitHub
parent 027c78ee4f 7871b24b59
commit 64d4c4020c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/LibusbUtils.cpp
View File

@ -10,8 +10,8 @@
#include <libusb.h> #include <libusb.h>
#endif #endif
#include "Common/Assert.h"
#include "Common/Flag.h" #include "Common/Flag.h"
#include "Common/Logging/Log.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Common/Thread.h" #include "Common/Thread.h"
@ -24,9 +24,11 @@ public:
Impl() Impl()
{ {
const int ret = libusb_init(&m_context); const int ret = libusb_init(&m_context);
ASSERT_MSG(IOS_USB, ret == LIBUSB_SUCCESS, "Failed to init libusb: {}", ErrorWrap(ret));
if (ret != LIBUSB_SUCCESS) if (ret != LIBUSB_SUCCESS)
{
ERROR_LOG_FMT(IOS_USB, "Failed to init libusb: {}", ErrorWrap(ret));
return; return;
}
#ifdef _WIN32 #ifdef _WIN32
const int usbdk_ret = libusb_set_option(m_context, LIBUSB_OPTION_USE_USBDK); const int usbdk_ret = libusb_set_option(m_context, LIBUSB_OPTION_USE_USBDK);