Merge pull request #607 from AttorneyOnline/cache-fix-2
Fix non-image files being loaded as images, fix custom shout button appearing on characters without it enabled
This commit is contained in:
		
						commit
						b8572f8afc
					
				@ -12,6 +12,9 @@ bool file_exists(QString file_path)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
bool dir_exists(QString dir_path)
 | 
					bool dir_exists(QString dir_path)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					  if (dir_path == "")
 | 
				
			||||||
 | 
					      return false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  QDir check_dir(dir_path);
 | 
					  QDir check_dir(dir_path);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  return check_dir.exists();
 | 
					  return check_dir.exists();
 | 
				
			||||||
 | 
				
			|||||||
@ -517,7 +517,7 @@ QString AOApplication::get_sfx_suffix(VPath sound_to_check)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
QString AOApplication::get_image_suffix(VPath path_to_check, bool static_image)
 | 
					QString AOApplication::get_image_suffix(VPath path_to_check, bool static_image)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  QStringList suffixes { "" };
 | 
					  QStringList suffixes {};
 | 
				
			||||||
  if (!static_image) {
 | 
					  if (!static_image) {
 | 
				
			||||||
    suffixes.append({ ".webp", ".apng", ".gif" });
 | 
					    suffixes.append({ ".webp", ".apng", ".gif" });
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user