From f43607a0771faf8d224b005483a139dd3704da5f Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Mon, 27 Mar 2023 23:19:50 +0200
Subject: [PATCH] early-access version 3483

---
 README.md                                     | 2 +-
 src/core/hle/service/hid/controllers/npad.cpp | 3 ++-
 src/yuzu/main.cpp                             | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index fe35795aa..2e9b9b9b2 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 3482.
+This is the source code for early-access 3483.
 
 ## Legal Notice
 
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index a57af3992..850f0d681 100755
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -1388,7 +1388,8 @@ Result Controller_NPad::MergeSingleJoyAsDualJoy(Core::HID::NpadIdType npad_id_1,
         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);
     controller_1.is_dual_left_connected = true;
     controller_1.is_dual_right_connected = true;
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 8c85980d0..baebfda1b 100755
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -307,6 +307,8 @@ GMainWindow::GMainWindow(std::unique_ptr<Config> config_, bool has_broken_vulkan
     system->Initialize();
 
     Common::Log::Initialize();
+    Common::Log::Start();
+
     LoadTranslation();
 
     setAcceptDrops(true);
@@ -449,8 +451,6 @@ GMainWindow::GMainWindow(std::unique_ptr<Config> config_, bool has_broken_vulkan
 
     SetupPrepareForSleep();
 
-    Common::Log::Start();
-
     QStringList args = QApplication::arguments();
 
     if (args.size() < 2) {