Focus the Team Monitor list view on Show(). Fixes #8775.hrev44415

2 files changed, 9 insertions, 2 deletions

diff --git a/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp b/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
index 80984041ea..25706d9cd9 100644
--- a/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
+++ b/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
@@ -261,6 +261,14 @@ TeamMonitorWindow::~TeamMonitorWindow()
 
 
 void
+TeamMonitorWindow::Show()
+{
+	fListView->MakeFocus();
+	BWindow::Show();
+}
+
+
+void
 TeamMonitorWindow::MessageReceived(BMessage* msg)
 {
 	switch (msg->what) {
@@ -416,8 +424,6 @@ TeamMonitorWindow::UpdateList()
 	}
 
 	fRestartButton->SetEnabled(!desktopRunning);
-
-	fListView->MakeFocus();
 }
 
 
diff --git a/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.h b/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.h
index 69c551e4c0..6a79829b65 100644
--- a/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.h
+++ b/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.h
@@ -27,6 +27,7 @@ public:
 	virtual					~TeamMonitorWindow();
 
 	virtual void			MessageReceived(BMessage* message);
+	virtual void			Show();
 	virtual bool			QuitRequested();
 
 			void			Enable();