early-access version 3483

This commit is contained in:
pineappleEA 2023-03-27 23:19:50 +02:00
parent 47ad21f742
commit f43607a077
3 changed files with 5 additions and 4 deletions

View file

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 3482. This is the source code for early-access 3483.
## Legal Notice ## Legal Notice

View file

@ -1388,7 +1388,8 @@ Result Controller_NPad::MergeSingleJoyAsDualJoy(Core::HID::NpadIdType npad_id_1,
return NpadIsDualJoycon; return NpadIsDualJoycon;
} }
// Disconnect the joycon at the second id and connect the dual joycon at the first index. // Disconnect the joycons and connect them as dual joycon at the first index.
DisconnectNpad(npad_id_1);
DisconnectNpad(npad_id_2); DisconnectNpad(npad_id_2);
controller_1.is_dual_left_connected = true; controller_1.is_dual_left_connected = true;
controller_1.is_dual_right_connected = true; controller_1.is_dual_right_connected = true;

View file

@ -307,6 +307,8 @@ GMainWindow::GMainWindow(std::unique_ptr<Config> config_, bool has_broken_vulkan
system->Initialize(); system->Initialize();
Common::Log::Initialize(); Common::Log::Initialize();
Common::Log::Start();
LoadTranslation(); LoadTranslation();
setAcceptDrops(true); setAcceptDrops(true);
@ -449,8 +451,6 @@ GMainWindow::GMainWindow(std::unique_ptr<Config> config_, bool has_broken_vulkan
SetupPrepareForSleep(); SetupPrepareForSleep();
Common::Log::Start();
QStringList args = QApplication::arguments(); QStringList args = QApplication::arguments();
if (args.size() < 2) { if (args.size() < 2) {