working fix for py5coding#394

hx2A · Feb 5, 2024 · 9dfaa14 · 9dfaa14
1 parent 12b4fb3
commit 9dfaa14
Showing 1 changed file with 25 additions and 17 deletions.
diff --git a/py5_resources/py5_module/py5/mixins/pixels.py b/py5_resources/py5_module/py5/mixins/pixels.py
@@ -30,6 +30,7 @@
 from PIL import Image
 from PIL.Image import Image as PIL_Image
 
+from .. import bridge
 from ..decorators import _hex_converter
 
 _Sketch = jpype.JClass("py5.core.Sketch")
@@ -246,26 +247,33 @@ def save(
             if isinstance(self._instance, _Sketch)
             else self._instance.parent
         )
-        if not isinstance(filename, BytesIO):
-            filename = Path(str(sketch_instance.savePath(str(filename))))
-        self.load_np_pixels()
-        arr = (
-            self.np_pixels[:, :, 1:]
-            if drop_alpha
-            else np.roll(self.np_pixels, -1, axis=2)
-        )
+        if (
+            isinstance(self._instance, _Sketch)
+            and bridge.check_run_method_callstack()
+            and self._py5_bridge.current_running_method not in ["setup", "draw"]
+        ):
+            self._instance.save(filename)
+        else:
+            if not isinstance(filename, BytesIO):
+                filename = Path(str(sketch_instance.savePath(str(filename))))
+            self.load_np_pixels()
+            arr = (
+                self.np_pixels[:, :, 1:]
+                if drop_alpha
+                else np.roll(self.np_pixels, -1, axis=2)
+            )
 
-        if use_thread:
+            if use_thread:
 
-            def _save(arr, filename, format, params):
-                Image.fromarray(arr).save(filename, format=format, **params)
+                def _save(arr, filename, format, params):
+                    Image.fromarray(arr).save(filename, format=format, **params)
 
-            t = threading.Thread(
-                target=_save, args=(arr, filename, format, params), daemon=True
-            )
-            t.start()
-        else:
-            Image.fromarray(arr).save(filename, format=format, **params)
+                t = threading.Thread(
+                    target=_save, args=(arr, filename, format, params), daemon=True
+                )
+                t.start()
+            else:
+                Image.fromarray(arr).save(filename, format=format, **params)
 
     # *** END METHODS ***