From 1bb126b06a00307ba4b1bff71bfce867894fbfbb Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Tue, 26 Jan 2021 13:18:14 +0100
Subject: [PATCH] fixed merge bug (fixes #758)

---
 src/gui/GameInfoDialog.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx
index 17a3dc2e7..e7858ce19 100644
--- a/src/gui/GameInfoDialog.cxx
+++ b/src/gui/GameInfoDialog.cxx
@@ -283,7 +283,7 @@ void GameInfoDialog::addControllersTab()
   VarList::push_back(items, "KidVid", "KIDVID");
   VarList::push_back(items, "Lightgun", "LIGHTGUN");
   VarList::push_back(items, "MindLink", "MINDLINK");
-  VarList::push_back(ctrls, "QuadTari", "QUADTARI");
+  VarList::push_back(items, "QuadTari", "QUADTARI");
 
   xpos = HBORDER; ypos = VBORDER;
   pwidth = _font.getStringWidth("Paddles_IAxis");