Ticket #12945: 0001-Screenshot-better-error-handling-on-save.patch

src/apps/screenshot/ScreenshotWindow.cpp

@@ -626 +626 @@
     // necessary, for example, when the user selects the Artwork folder from
     // the list of predefined folders.
     if (!directoryEntry.Exists()) {
-        if (create_directory(path.Path(), 0755) != B_OK) {
+        status_t directoryCreateStatus = create_directory(path.Path(), 0755);
+        if (directoryCreateStatus != B_OK) {
+            BString alertText;
+            alertText.SetToFormat(B_TRANSLATE("Error saving \"%s\":\n\t%s"),
+                fNameControl->Text(), strerror(directoryCreateStatus));
+
+            BAlert* alert = new BAlert("Error", alertText.String(),
+                B_TRANSLATE("OK"), NULL, NULL,
+                B_WIDTH_AS_USUAL, B_STOP_ALERT);
+
+            alert->SetShortcut(0, B_ESCAPE);
+            alert->Go();
+
             return B_ERROR;
         }
     } else if (!directoryEntry.IsDirectory()) {
         // the entry exists but is not a directory.
         // not much we can do
-        return B_ERROR;
+        BString alertText;
+        alertText.SetToFormat(B_TRANSLATE("Error saving \"%s\":\n"
+            "The destination path exists but is not a folder."),
+            fNameControl->Text());
+
+        BAlert* alert = new BAlert("Error", alertText.String(),
+            B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+
+        alert->SetShortcut(0, B_ESCAPE);
+        alert->Go();
+
+        return B_NOT_A_DIRECTORY;
     }
 
     path.Append(fNameControl->Text());
@@ -655 +678 @@
             return B_CANCELED;
     }
 
-    return fUtility.Save(fScreenshot, path.Path(), fImageFileType);
+    status_t saveStatus = fUtility.Save(fScreenshot,
+        path.Path(), fImageFileType);
+
+    if (saveStatus != B_OK) {
+        BString alertText;
+        alertText.SetToFormat(B_TRANSLATE("Error saving \"%s\":\n\t%s"),
+                fNameControl->Text(), strerror(saveStatus));
+
+        BAlert* alert = new BAlert("Error", alertText.String(),
+            B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+
+        alert->SetShortcut(0, B_ESCAPE);
+        alert->Go();
+        return B_ERROR;
+    }
+    return B_OK;
 }