X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cc04507967e93a582721adf19c8adc72fd4d92f..8946ede10c2702c7acbb194fe8bd2793d7fb8358:/src/gtk/animate.cpp

diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp
index c6f7abe951..02e2886873 100644
--- a/src/gtk/animate.cpp
+++ b/src/gtk/animate.cpp
@@ -127,6 +127,7 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
     g_signal_connect(loader, "area-updated", G_CALLBACK(gdk_pixbuf_area_updated), this);
 
     guchar buf[2048];
+    bool data_written = false;
     while (stream.IsOk())
     {
         // read a chunk of data
@@ -135,10 +136,21 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
         // fetch all data into the loader
         if (!gdk_pixbuf_loader_write(loader, buf, stream.LastRead(), &error))
         {
-            gdk_pixbuf_loader_close(loader, &error);
             wxLogDebug(wxT("Could not write to the loader: %s"), error->message);
+
+            // gdk_pixbuf_loader_close wants the GError == NULL; reset it:
+            error = NULL;
+            gdk_pixbuf_loader_close(loader, &error);
             return false;
         }
+
+        data_written = true;
+    }
+
+    if (!data_written)
+    {
+        wxLogDebug("Could not read data from the stream...");
+        return false;
     }
 
     // load complete
@@ -149,7 +161,7 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
     }
 
     // wait until we get the last area_updated signal
-    return true;
+    return data_written;
 }
 
 wxImage wxAnimation::GetFrame(unsigned int WXUNUSED(frame)) const
@@ -238,6 +250,8 @@ wxAnimationCtrl::~wxAnimationCtrl()
 bool wxAnimationCtrl::LoadFile(const wxString &filename, wxAnimationType type)
 {
     wxFileInputStream fis(filename);
+    if (!fis.IsOk())
+        return false;
     return Load(fis, type);
 }