1 files changed, 40 insertions, 31 deletions

diff --git a/src/aoscene.cpp b/src/aoscene.cpp
index 344522b6..fc686336 100644
--- a/src/aoscene.cpp
+++ b/src/aoscene.cpp
@@ -7,16 +7,19 @@ AOScene::AOScene(QWidget *parent, AOApplication *p_ao_app) : QLabel(parent)
   m_parent = parent;
   ao_app = p_ao_app;
   m_movie = new QMovie(this);
+  last_image = "";
 }
 
 void AOScene::set_image(QString p_image)
 {
-  QString background_path = ao_app->get_background_path(p_image + ".png");
-  QString animated_background_path = ao_app->get_background_path(p_image + ".gif");
-  QString default_path = ao_app->get_default_background_path(p_image + ".png");
+  QString background_path =
+      ao_app->get_image_suffix(ao_app->get_background_path(p_image));
+  if (!file_exists(background_path))
+    background_path = ao_app->get_image_suffix(
+        ao_app->get_default_background_path(p_image)); // Default path
 
-  QPixmap background(background_path);
-  QPixmap default_bg(default_path);
+  if (file_exists(background_path) && background_path == last_image)
+    return;
 
   int w = this->width();
   int h = this->height();
@@ -25,52 +28,58 @@ void AOScene::set_image(QString p_image)
   this->setMovie(nullptr);
 
   m_movie->stop();
-  m_movie->setFileName(animated_background_path);
+  m_movie->setFileName(background_path);
   m_movie->setScaledSize(QSize(w, h));
 
-  if (m_movie->isValid())
-  {
+  if (m_movie->isValid()) {
     this->setMovie(m_movie);
     m_movie->start();
   }
-  else if (file_exists(background_path))
-  {
+  else {
+    QPixmap background(background_path);
     this->setPixmap(background.scaled(w, h));
   }
-  else
-  {
-    this->setPixmap(default_bg.scaled(w, h));
-  }
+  last_image = background_path;
 }
 
 void AOScene::set_legacy_desk(QString p_image)
 {
-  //vanilla desks vary in both width and height. in order to make that work with viewport rescaling,
-  //some INTENSE math is needed.
 
-  QString desk_path = ao_app->get_background_path(p_image);
-  QString default_path = ao_app->get_default_background_path(p_image);
+  QString desk_path =
+      ao_app->get_image_suffix(ao_app->get_background_path(p_image));
+  if (!file_exists(desk_path))
+    desk_path = ao_app->get_image_suffix(
+        ao_app->get_default_background_path(p_image)); // Default path
 
-  QPixmap f_desk;
+  if (file_exists(desk_path) && desk_path == last_image)
+    return;
+  QPixmap f_desk(desk_path);
 
-  if (file_exists(desk_path))
-    f_desk.load(desk_path);
-  else
-    f_desk.load(default_path);
+  // vanilla desks vary in both width and height. in order to make that work
+  // with viewport rescaling, some INTENSE math is needed.
 
   int vp_width = m_parent->width();
   int vp_height = m_parent->height();
 
-  //double y_modifier = 147 / 192;
-  //double w_modifier = vp_width / 256;
   double h_modifier = vp_height / 192;
 
-  //int final_y = y_modifier * vp_height;
-  //int final_w = w_modifier * f_desk.width();
   int final_h = static_cast<int>(h_modifier * f_desk.height());
 
-  //this->resize(final_w, final_h);
-  //this->setPixmap(f_desk.scaled(final_w, final_h));
-  this->resize(vp_width, final_h);
-  this->setPixmap(f_desk.scaled(vp_width, final_h));
+  this->clear();
+  this->setMovie(nullptr);
+
+  m_movie->stop();
+  m_movie->setFileName(desk_path);
+
+  m_movie->setScaledSize(QSize(vp_width, final_h));
+
+  if (m_movie->isValid()) {
+    this->setMovie(m_movie);
+    m_movie->start();
+  }
+  else {
+    this->resize(vp_width, final_h);
+    this->setPixmap(f_desk.scaled(vp_width, final_h));
+  }
+  last_image = desk_path;
 }