Skip to content

Bring back support for jpg/jpeg cuz I misinterpreted an AO PR #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Crystalwarrior merged 1 commit into from
Dec 25, 2024
Merged

Bring back support for jpg/jpeg cuz I misinterpreted an AO PR #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/courtroom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1877,7 +1877,9 @@ void Courtroom::update_character(int p_cid, QString char_name, bool reset_emote)
if (dir_exists(custom_objection_dir)) {
ui_custom_objection->show();
QDir directory(custom_objection_dir);
QStringList custom_obj = directory.entryList(QStringList() << "*.png"
QStringList custom_obj = directory.entryList(QStringList() << "*.jpg"
<< "*.jpeg"
<< "*.png"
<< "*.gif"
<< "*.apng"
<< "*.webp",
Expand Down
2 changes: 1 addition & 1 deletion src/text_file_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ QString AOApplication::get_image_suffix(VPath path_to_check, bool static_image)
if (!static_image) {
suffixes.append({ ".webp", ".apng", ".gif" });
}
suffixes.append(".png");
suffixes.append({ ".png", ".jpg", ".jpeg" });

// Check if we were provided a direct filepath with a suffix already
QString path = path_to_check.toQString();
Expand Down
Loading