From 358787441e3ce9d5181fd6910a2d8e57c311fe27 Mon Sep 17 00:00:00 2001
From: mlc4050 <63271527+mlc4050@users.noreply.github.com>
Date: Wed, 8 Apr 2020 02:14:22 -0500
Subject: [PATCH] Disabled merging for Mayflash 2 port SNES controller and
 Xinmo 2 player usb encoder

* Disabled merging for Mayflash and Xinmo 2 player controller vids

* Added a PID check before bypassing device merging
---
 input.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/input.cpp b/input.cpp
index 59fce7c..541e44b 100644
--- a/input.cpp
+++ b/input.cpp
@@ -2730,9 +2730,20 @@ void mergedevs()
 	// merge multifunctional devices by id
 	for (int i = 0; i < NUMDEV; i++)
 	{
-		// Raphnet uses buggy firmware, don't merge it.
-		if (input[i].vid == 0x289B) continue;
-
+		//Bypass merging of specified 2 port/player controllers
+		if (input[i].vid == 0x289B) // Raphnet uses buggy firmware, don't merge it.
+			continue;
+		else if(input[i].vid == 0x0E8F) //Vendor -Mayflash
+		{
+			if(input[i].pid == 0x3013)  //SNES controller 2 port adapter
+				continue;
+		}
+		else if(input[i].vid == 0x16C0) //Vendor - XinMo
+		{
+			if(input[i].pid == 0x05E1) //XM-10 2 player USB Encoder
+				continue;
+		}
+			
 		input[i].bind = i;
 		if (input[i].id[0] && !input[i].mouse)
 		{