Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix an issue with "missing desk" not properly replacing last_image (making everyone's desk break from pos hld to def/wit/pro)

Browse Source
This commit is contained in:
Crystalwarrior 2019-10-13 02:51:07 +03:00
parent 1cc5b5b441
commit 6d7a6d7398
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/aoscene.cpp
View File

@ -15,11 +15,11 @@ void AOScene::set_image(QString p_image)
QString background_path = ao_app->get_image_suffix(ao_app->get_background_path(p_image)); QString background_path = ao_app->get_image_suffix(ao_app->get_background_path(p_image));
if (!file_exists(background_path)) //If image is missing, clear current image if (!file_exists(background_path)) //If image is missing, clear current image
{ {
//background_path = ao_app->get_image_suffix(ao_app->get_default_background_path(p_image)); //Default path
this->clear(); this->clear();
this->setMovie(nullptr); this->setMovie(nullptr);
m_movie->stop(); m_movie->stop();
last_image = "";
return; return;
} }
@ -55,11 +55,11 @@ void AOScene::set_legacy_desk(QString p_image)
QString desk_path = ao_app->get_image_suffix(ao_app->get_background_path(p_image)); QString desk_path = ao_app->get_image_suffix(ao_app->get_background_path(p_image));
if (!file_exists(desk_path)) //If image is missing, clear current image if (!file_exists(desk_path)) //If image is missing, clear current image
{ {
//desk_path = ao_app->get_image_suffix(ao_app->get_default_background_path(p_image)); //Default path
this->clear(); this->clear();
this->setMovie(nullptr); this->setMovie(nullptr);
m_movie->stop(); m_movie->stop();
last_image = "";
return; return;
} }