Skip to content

Commit 26e04db

Browse files
authored
Fix 'Filter Slimes and HMD' dev setting only showing OpenVR HMD (#1614)
1 parent fade902 commit 26e04db

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

gui/src/components/tracker/TrackersTable.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import classNames from 'classnames';
33
import { IPv4 } from 'ip-num';
44
import { MouseEventHandler, ReactNode, useMemo, useState } from 'react';
55
import {
6+
BodyPart,
67
TrackerDataT,
78
TrackerIdT,
89
TrackerStatus as TrackerStatusEnum,
@@ -47,13 +48,13 @@ const displayColumns: { [k: string]: boolean } = {
4748
[DisplayColumn.URL]: true,
4849
};
4950

51+
const isHMD = ({ tracker }: FlatDeviceTracker) =>
52+
tracker.info?.isHmd || tracker.info?.bodyPart === BodyPart.HEAD;
53+
5054
const isSlime = ({ device }: FlatDeviceTracker) =>
5155
device?.hardwareInfo?.manufacturer === 'SlimeVR' ||
5256
device?.hardwareInfo?.manufacturer === 'HID Device';
5357

54-
const getDeviceName = ({ device }: FlatDeviceTracker) =>
55-
device?.customName?.toString() || '';
56-
5758
const getTrackerName = ({ tracker }: FlatDeviceTracker) =>
5859
tracker?.info?.customName?.toString() || '';
5960

@@ -181,7 +182,7 @@ export function TrackersTable({
181182
// TODO: fix memo
182183
const filteredSortedTrackers = useMemo(() => {
183184
const list = filteringEnabled
184-
? flatTrackers.filter((t) => getDeviceName(t) === 'HMD' || isSlime(t))
185+
? flatTrackers.filter((t) => isHMD(t) || isSlime(t))
185186
: flatTrackers;
186187

187188
if (sortingEnabled) {

0 commit comments

Comments
 (0)