From 8a9866347def84341a611890b9f567dbce7b23cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Thu, 13 Apr 2006 20:26:45 +0000
Subject: [PATCH] added checks for locking also assigning the window field to
 null when quitting the window

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17128 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../devices/keyboard/KeyboardInputDevice.cpp  |  4 +-
 .../devices/keyboard/TMWindow.cpp             | 57 ++++++++++---------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
index 42a05f5a2c..73f2229831 100644
--- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
+++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
@@ -463,8 +463,10 @@ KeyboardInputDevice::Stop(const char *name, void *cookie)
 		wait_for_thread(device->device_watcher, &dummy);
 	}
 	
-	if (fTMWindow)
+	if (fTMWindow) {
 		fTMWindow->PostMessage(B_QUIT_REQUESTED);
+		fTMWindow = NULL;
+	}
 	
 	return B_OK;
 }
diff --git a/src/add-ons/input_server/devices/keyboard/TMWindow.cpp b/src/add-ons/input_server/devices/keyboard/TMWindow.cpp
index 2eaa9235e5..0ac5745e84 100644
--- a/src/add-ons/input_server/devices/keyboard/TMWindow.cpp
+++ b/src/add-ons/input_server/devices/keyboard/TMWindow.cpp
@@ -48,27 +48,28 @@ TMWindow::TMWindow()
 		B_ALL_WORKSPACES),
 	fQuitting(false)
 {
-	Lock();
+	if (Lock()) {
 
-	// ToDo: make this font sensitive
-
-	fView = new TMView(Bounds(), "background", B_FOLLOW_ALL,
-		B_WILL_DRAW, B_NO_BORDER);
-	AddChild(fView);
-
-	float width, height;
-	fView->GetPreferredSize(&width, &height);
-	ResizeTo(width, height);
-
-	BRect screenFrame = BScreen(this).Frame();
-	BPoint point;
-	point.x = (screenFrame.Width() - Bounds().Width()) / 2;
-	point.y = (screenFrame.Height() - Bounds().Height()) / 2;
-
-	if (screenFrame.Contains(point))
+		// ToDo: make this font sensitive
+	
+		fView = new TMView(Bounds(), "background", B_FOLLOW_ALL,
+			B_WILL_DRAW, B_NO_BORDER);
+		AddChild(fView);
+	
+		float width, height;
+		fView->GetPreferredSize(&width, &height);
+		ResizeTo(width, height);
+	
+		BRect screenFrame = BScreen(this).Frame();
+		BPoint point;
+		point.x = (screenFrame.Width() - Bounds().Width()) / 2;
+		point.y = (screenFrame.Height() - Bounds().Height()) / 2;
+	
+		if (screenFrame.Contains(point))
 		MoveTo(point);
 
-	Unlock();
+		Unlock();
+	}
 }
 
 
@@ -102,11 +103,14 @@ TMWindow::QuitRequested()
 void
 TMWindow::Enable()
 {
-	SetPulseRate(1000000);
-
-	if (IsHidden()) {
-		fView->UpdateList();
-		Show();
+	if (Lock()) {
+		SetPulseRate(1000000);
+	
+		if (IsHidden()) {
+			fView->UpdateList();
+			Show();
+		}
+		Unlock();
 	}
 }
 
@@ -198,6 +202,7 @@ TMView::AttachedToWindow()
 		reboot->SetTarget(this);
 
 	fKillButton->SetTarget(this);
+	fRestartButton->SetTarget(this);
 	fListView->SetTarget(this);
 }
 
@@ -217,7 +222,6 @@ TMView::MessageReceived(BMessage *msg)
 			break;
 		}
 		case TM_RESTART_DESKTOP: {
-			fRestartButton->SetEnabled(false);
 			if (!be_roster->IsRunning(kTrackerSignature))
 				be_roster->Launch(kTrackerSignature);
 			if (!be_roster->IsRunning(kDeskbarSignature))
@@ -302,10 +306,9 @@ TMView::UpdateList()
 
 	bool desktopRunning = be_roster->IsRunning(kTrackerSignature)
 		&&  be_roster->IsRunning(kDeskbarSignature);
-	if (desktopRunning ^ fRestartButton->IsHidden())
+	if (!desktopRunning && fRestartButton->IsHidden())
 		fRestartButton->Show();
-	if (!desktopRunning)
-		fRestartButton->SetEnabled(true);
+	fRestartButton->SetEnabled(!desktopRunning);
 }