From 72ac7d1ce9e15803e4adb759dbd318b75d652724 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 5 Dec 2022 18:53:28 +1100
Subject: [PATCH] Corrected default combined frame duration

---
 Tests/images/duplicate_frame.gif | Bin 0 -> 138 bytes
 Tests/test_file_gif.py           |  16 ++++++++++++++++
 src/PIL/GifImagePlugin.py        |   2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 Tests/images/duplicate_frame.gif

diff --git a/Tests/images/duplicate_frame.gif b/Tests/images/duplicate_frame.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ef0c894a540b0ca3074938666fd22a7d93d1fd0d
GIT binary patch
literal 138
zcmZ?wbhEHb<YM4r_`m=Kia%KxQh;p5|J;7AA;Hd$0j@@R2F#2=AsvtskYWZVj+XwF
Yr{D4?Ycs&q!zCL+Lqmb;NK;}B0Qxx_j{pDw

literal 0
HcmV?d00001

diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py
index 926f5c1eea8..49820d6daea 100644
--- a/Tests/test_file_gif.py
+++ b/Tests/test_file_gif.py
@@ -791,6 +791,22 @@ def test_roundtrip_info_duration(tmp_path):
         ] == duration_list
 
 
+def test_roundtrip_info_duration_combined(tmp_path):
+    out = str(tmp_path / "temp.gif")
+    with Image.open("Tests/images/duplicate_frame.gif") as im:
+        assert [frame.info["duration"] for frame in ImageSequence.Iterator(im)] == [
+            1000,
+            1000,
+            1000,
+        ]
+        im.save(out, save_all=True)
+
+    with Image.open(out) as reloaded:
+        assert [
+            frame.info["duration"] for frame in ImageSequence.Iterator(reloaded)
+        ] == [1000, 2000]
+
+
 def test_identical_frames(tmp_path):
     duration_list = [1000, 1500, 2000, 4000]
 
diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py
index dd1b21f2e63..13894c8d6d9 100644
--- a/src/PIL/GifImagePlugin.py
+++ b/src/PIL/GifImagePlugin.py
@@ -618,7 +618,7 @@ def _write_multiple_frames(im, fp, palette):
                 bbox = delta.getbbox()
                 if not bbox:
                     # This frame is identical to the previous frame
-                    if duration:
+                    if encoderinfo.get("duration"):
                         previous["encoderinfo"]["duration"] += encoderinfo["duration"]
                     continue
             else: