From 6b580d285cc2848adc3449060b72f4aa65ed982f Mon Sep 17 00:00:00 2001
From: "chunmao.guo" <chunmao.guo@bambulab.com>
Date: Tue, 30 Aug 2022 18:39:29 +0800
Subject: [PATCH] FIX: some bugs with media files

Change-Id: Ia5e0710a2979ae338902042e520ba9210e3a557d
---
 src/slic3r/GUI/ImageGrid.cpp                 |  8 ++++----
 src/slic3r/GUI/Printer/PrinterFileSystem.cpp | 11 +++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/slic3r/GUI/ImageGrid.cpp b/src/slic3r/GUI/ImageGrid.cpp
index 5305ec97d..3fdccc7d3 100644
--- a/src/slic3r/GUI/ImageGrid.cpp
+++ b/src/slic3r/GUI/ImageGrid.cpp
@@ -480,13 +480,13 @@ void ImageGrid::render(wxDC& dc)
                 if (file.IsDownload()) {
                     if (file.progress == -1) {
                         secondAction = _L("Cancel");
-                        dc.DrawText(_L("Waiting"), pt + wxPoint{24, m_image_size.GetHeight() - 36});
+                        dc.DrawText(_L("Waiting"), pt + wxPoint{24, m_image_size.GetHeight() - 64});
                     } else if (file.progress < 0) {
                         secondAction = _L("Retry");
-                        dc.DrawText(_L("Failed"), pt + wxPoint{24, m_image_size.GetHeight() - 36});
+                        dc.DrawText(_L("Failed"), pt + wxPoint{24, m_image_size.GetHeight() - 64});
                     } else if (file.progress >= 100) {
                         secondAction = _L("Open");
-                        dc.DrawText(_L("Finished"), pt + wxPoint{24, m_image_size.GetHeight() - 36});
+                        dc.DrawText(_L("Finished"), pt + wxPoint{24, m_image_size.GetHeight() - 64});
                     } else {
                         secondAction = _L("Cancel");
                         if (file.progress != m_background_progress) {
@@ -567,7 +567,7 @@ void Slic3r::GUI::ImageGrid::renderButtons(wxDC &dc, wxStringList const &texts,
     wxRect rect(rect2);
     rect.SetWidth(rect.GetWidth() / texts.size());
     int state = m_pressed ? StateColor::Pressed : StateColor::Hovered;
-    dc.SetFont(Label::Body_12);
+    dc.SetFont(Label::Body_14);
     //mdc.SelectObject(m_button_background);
     for (size_t i = 0; i < texts.size(); ++i) {
         int states = hit == i ? state : 0;
diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
index 621c61456..5bcf37da6 100644
--- a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
+++ b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
@@ -290,6 +290,8 @@ void PrinterFileSystem::BuildGroups()
 {
     if (m_file_list.empty())
         return;
+    m_group_year.clear();
+    m_group_month.clear();
     wxDateTime t = wxDateTime((time_t) m_file_list.front().time);
     m_group_year.push_back(0);
     m_group_month.push_back(0);
@@ -451,10 +453,11 @@ void PrinterFileSystem::UpdateFocusThumbnail()
             wxString            mimetype  = resp.value("mimetype", "image/jpeg");
             std::string         thumbnail = resp["thumbnail"];
             boost::uint32_t     size      = resp["size"];
-            wxMemoryInputStream mis(data, size);
-            wxImage             image(mis, mimetype);
-            thumb.name      = thumbnail;
-            thumb.thumbnail = image;
+            thumb.name = thumbnail;
+            if (size > 0) {
+                wxMemoryInputStream mis(data, size);
+                thumb.thumbnail = wxImage(mis, mimetype);
+            }
             return 0;
         },
         [this](int result, Thumbnail const &thumb) {