From 21629aa53d20aa3a584fecb0545afa1c49308ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Mon, 26 Apr 2010 10:00:59 +0000 Subject: [PATCH] Don't allow the main window to be minimized when the Deskbar is not running. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36481 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/bootman/BootManagerWindow.cpp | 11 ++++++++++- src/apps/bootman/Jamfile | 3 +-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/apps/bootman/BootManagerWindow.cpp b/src/apps/bootman/BootManagerWindow.cpp index 378d27f3a1..aa8e84b727 100644 --- a/src/apps/bootman/BootManagerWindow.cpp +++ b/src/apps/bootman/BootManagerWindow.cpp @@ -17,10 +17,13 @@ #include #include +#include #include #include +#include "tracker_private.h" + #undef TR_CONTEXT #define TR_CONTEXT "BootManagerWindow" @@ -28,7 +31,8 @@ BootManagerWindow::BootManagerWindow() - : BWindow(BRect(100, 100, 500, 400), TR_CMT("Boot Manager", "Window Title"), + : + BWindow(BRect(100, 100, 500, 400), TR_CMT("Boot Manager", "Window Title"), B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE) { @@ -44,6 +48,11 @@ BootManagerWindow::BootManagerWindow() AddShortcut('A', B_COMMAND_KEY, new BMessage(B_ABOUT_REQUESTED)); CenterOnScreen(); + + // Prevent minimizing this window if the user would have no way to + // get back to it. (For example when only the Installer runs.) + if (!be_roster->IsRunning(kDeskbarSignature)) + SetFlags(Flags() | B_NOT_MINIMIZABLE); } diff --git a/src/apps/bootman/Jamfile b/src/apps/bootman/Jamfile index 50897360f3..96f9e71823 100644 --- a/src/apps/bootman/Jamfile +++ b/src/apps/bootman/Jamfile @@ -1,7 +1,6 @@ SubDir HAIKU_TOP src apps bootman ; -UsePrivateHeaders shared ; -UsePrivateHeaders storage ; +UsePrivateHeaders shared storage tracker ; Application bootman : BootManager.cpp