X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro.c;h=08ef052fc3c33b9f9872d4ea807a8e722f2a9ce5;hb=abaa8b9e916f689ba162a684c2e23890cea7d6da;hp=44cb9747f7da3be728da956ac99b8531ffadbf0b;hpb=65e1ed6336087968fa9e7631f1a653210c2ce564;p=pcsx_rearmed.git

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 44cb9747..08ef052f 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -527,13 +527,13 @@ static void update_controller_port_variable(unsigned port)
 	if (controller_port_variable(port, &var))
 	{
 		if (strcmp(var.value, "standard") == 0)
-			in_type[0] = PSE_PAD_TYPE_STANDARD;
+			in_type[port] = PSE_PAD_TYPE_STANDARD;
 		else if (strcmp(var.value, "analog") == 0)
-			in_type[0] = PSE_PAD_TYPE_ANALOGPAD;
+			in_type[port] = PSE_PAD_TYPE_ANALOGPAD;
 		else if (strcmp(var.value, "negcon") == 0)
-			in_type[0] = PSE_PAD_TYPE_NEGCON;
+			in_type[port] = PSE_PAD_TYPE_NEGCON;
 		else if (strcmp(var.value, "none") == 0)
-			in_type[0] = PSE_PAD_TYPE_NONE;
+			in_type[port] = PSE_PAD_TYPE_NONE;
 		// else 'default' case, do nothing
 	}
 }
@@ -638,7 +638,10 @@ void retro_get_system_info(struct retro_system_info *info)
 {
 	memset(info, 0, sizeof(*info));
 	info->library_name = "PCSX-ReARMed";
-	info->library_version = "r22";
+#ifndef GIT_VERSION
+#define GIT_VERSION ""
+#endif
+	info->library_version = "r22" GIT_VERSION;
 	info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u";
 	info->need_fullpath = true;
 }