From de24087ae863307b470f4ac7426226bf04a4225e Mon Sep 17 00:00:00 2001 From: Rob Gill Date: Tue, 15 Jan 2019 21:02:01 +1000 Subject: [PATCH] installer: Fix Bug #14594 / avoid UI reset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Adds check for completed installation when exiting BootManager or DriveSetup. * If installation has completed, quit or restart buttons are maintained, along with appropriate guidance, rather than the UI reset described in bug Change-Id: I064ccecb77b1a0e4347e1e36564614383b1409d5 Reviewed-on: https://review.haiku-os.org/c/881 Reviewed-by: Stephan Aßmus --- src/apps/installer/InstallerWindow.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp index 603d7963bd..7f6671dc22 100644 --- a/src/apps/installer/InstallerWindow.cpp +++ b/src/apps/installer/InstallerWindow.cpp @@ -563,11 +563,14 @@ InstallerWindow::MessageReceived(BMessage *msg) } else { // If neither DriveSetup nor Bootman is running, we need // to scan partitions in case DriveSetup has quit, or - // we need to update the guidance message. + // we need to update the guidance message, unless install + // was already finished. if (scanPartitions) _ScanPartitions(); - else + else if (fInstallStatus != kFinished) _UpdateControls(); + else + PostMessage(MSG_INSTALL_FINISHED); } } break;