Ticket #2232: diskfull.patch

installer/CopyEngine.cpp

@@ -74 +74 @@
                 {
                         status_t err = Start(fWindow->GetSourceMenu(),
                                 fWindow->GetTargetMenu());
-                        if (err != B_OK) {
+                        if (err != B_OK || fControl->CheckUserCanceled()) {
                                 ERR("Start failed");
+                                SetStatusMessage("Installation aborted." );
                                 BMessenger(fWindow).SendMessage(RESET_INSTALL);
                         }
                         break;
@@ -283 +284 @@
                         BPath path;
                         entry.GetPath(&path);
                         ERR2("error while copying %s", path.Path());
+                        fControl->Cancel(false);
                 }
         }
 }

installer/InstallerCopyLoopControl.cpp

@@ -100 +100 @@
 
 
 bool
-InstallerCopyLoopControl::Cancel()
+InstallerCopyLoopControl::Cancel(bool alert)
 {
-        fUserCanceled = (new BAlert("", 
+        fUserCanceled = alert ? (new BAlert("", 
                         "Are you sure you want to to stop the installation?", 
                         "Continue", "Stop", 0,
-                        B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() != 0;
+                        B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() != 0 : true;
         return fUserCanceled;
 }
 

installer/InstallerWindow.cpp

@@ -217 +217 @@
                                         }
                                         break;
                                 case kFinished:
+                                        SetStatusMessage("Installation completed.");
                                         PostMessage(B_QUIT_REQUESTED);
                                         break;
                                 case kCancelled:

installer/InstallerCopyLoopControl.h

@@ -35 +35 @@
                 virtual bool ChecksumFile(const entry_ref *);
                 virtual bool SkipAttribute(const char *attributeName);
                 virtual bool PreserveAttribute(const char *attributeName);
-                bool Cancel();
+                bool Cancel(bool alert = true);
                 void Reset();
 
         private:

installer/FSUtils.cpp

@@ -831 +831 @@
         if (gStatusWindow)
                 gStatusWindow->RemoveStatusItem(thread);
 
-        return B_OK;
+        return result;
 }
 
 class FailWithAlert {