Do not catch OSError raised when loading image

nulano · May 11, 2023 · 7e29efd · 7e29efd
1 parent 3ec03c6
commit 7e29efd
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/PIL/ImageGrab.py b/src/PIL/ImageGrab.py
@@ -66,10 +66,6 @@ def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=N
             msg = "Pillow was built without XCB support"
             raise OSError(msg)
         size, data = Image.core.grabscreen_x11(xdisplay)
-        im = Image.frombytes("RGB", size, data, "raw", "BGRX", size[0] * 4, 1)
-        if bbox:
-            im = im.crop(bbox)
-        return im
     except OSError:
         if (
             xdisplay is None
@@ -89,6 +85,11 @@ def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=N
             return im
         else:
             raise
+    else:
+        im = Image.frombytes("RGB", size, data, "raw", "BGRX", size[0] * 4, 1)
+        if bbox:
+            im = im.crop(bbox)
+        return im
 
 
 def grabclipboard():