From a0f0cb5a9da5e88c580d5610db69fbd1ae9b3b51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
Date: Sun, 20 Dec 2020 21:54:13 +0100
Subject: [PATCH] Input preferences: fix list item retrieval

Fixes #16679

Change-Id: I87844b7745dc2d9e126983a888caf01f37f6b742
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3540
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
---
 src/preferences/input/InputWindow.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/preferences/input/InputWindow.cpp b/src/preferences/input/InputWindow.cpp
index 7c19ed4b60..e0536da250 100644
--- a/src/preferences/input/InputWindow.cpp
+++ b/src/preferences/input/InputWindow.cpp
@@ -113,11 +113,11 @@ InputWindow::MessageReceived(BMessage* message)
 				if (device)
 					AddDevice(device);
 			} else {
-				for (int i = 0; i < fDeviceListView->CountItems();
-					i++) {
-					BStringItem* item = dynamic_cast<BStringItem*>(
-						fDeviceListView->ItemAt(i));
-					if (item->Text() == name) {
+				for (int i = 0; i < fDeviceListView->CountItems(); i++) {
+					DeviceListItemView* item =
+						dynamic_cast<DeviceListItemView*>(
+							fDeviceListView->ItemAt(i));
+					if (item != NULL && item->Label() == name) {
 						fDeviceListView->RemoveItem(i);
 						BView* settings = fCardView->ChildAt(i);
 						fCardView->RemoveChild(settings);