diff --git a/src/apps/installer/InstallerApp.cpp b/src/apps/installer/InstallerApp.cpp index 576cfba698..a787655111 100644 --- a/src/apps/installer/InstallerApp.cpp +++ b/src/apps/installer/InstallerApp.cpp @@ -47,7 +47,7 @@ static const char* kInfoText = "This is alpha-quality software! It means there is a high risk of loosing " "important data. Make frequent backups! You have been warned.\n\n" -"1) If you are installing Haiku onto real hardware (not inside an emulation) " +"1) If you are installing Haiku onto real hardware (not inside an emulator) " "you need to have prepared a harddisk partition. The Installer and the " "DriveSetup tool will only offer to initialize existing partitions with the " "Haiku native filesystem. We recommend using the GParted Live-CD, it can also " diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp index 7cc1217643..e89920f5a4 100644 --- a/src/apps/installer/InstallerWindow.cpp +++ b/src/apps/installer/InstallerWindow.cpp @@ -351,7 +351,7 @@ InstallerWindow::MessageReceived(BMessage *msg) switch (fInstallStatus) { case kReadyForInstall: { - BList *list = new BList(); + BList* list = new BList(); int32 size = 0; fPackagesView->GetPackagesToInstall(list, &size); fCopyEngine->SetPackagesList(list); @@ -380,10 +380,10 @@ InstallerWindow::MessageReceived(BMessage *msg) break; case SRC_PARTITION: _PublishPackages(); - _UpdateMenus(); + _UpdateControls(); break; case TARGET_PARTITION: - _UpdateMenus(); + _UpdateControls(); break; case SETUP_MESSAGE: _LaunchDriveSetup(); @@ -424,7 +424,7 @@ InstallerWindow::MessageReceived(BMessage *msg) _DisableInterface(fDriveSetupLaunched); if (fDriveSetupLaunched) _SetStatusMessage("Running DriveSetup" B_UTF8_ELLIPSIS - "\nClose DriveSetup to continue with the\n" + "\n\nClose DriveSetup to continue with the " "installation."); else _ScanPartitions(); @@ -443,7 +443,7 @@ InstallerWindow::QuitRequested() { if (fDriveSetupLaunched) { (new BAlert("driveSetup", - "Please close the DriveSetup window before closing the\n" + "Please close the DriveSetup window before closing the " "Installer window.", "OK"))->Go(); return false; } @@ -515,12 +515,12 @@ InstallerWindow::_ScanPartitions() if (fSrcMenu->ItemAt(0)) { _PublishPackages(); } - _UpdateMenus(); + _UpdateControls(); } void -InstallerWindow::_UpdateMenus() +InstallerWindow::_UpdateControls() { PartitionMenuItem* srcItem = (PartitionMenuItem*)fSrcMenu->FindMarked(); BString label; @@ -558,6 +558,7 @@ InstallerWindow::_UpdateMenus() label = "Please Choose Target"; } fDestMenuField->MenuItem()->SetLabel(label.String()); + if (srcItem && dstItem) { char message[255]; sprintf(message, "Press the Begin button to install from '%s' onto " diff --git a/src/apps/installer/InstallerWindow.h b/src/apps/installer/InstallerWindow.h index 4ab550abd4..6f00d98e0a 100644 --- a/src/apps/installer/InstallerWindow.h +++ b/src/apps/installer/InstallerWindow.h @@ -52,7 +52,7 @@ private: void _LaunchDriveSetup(); void _DisableInterface(bool disable); void _ScanPartitions(); - void _UpdateMenus(); + void _UpdateControls(); void _PublishPackages(); void _SetStatusMessage(const char* text);