blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 20:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix backslash interpretation in IconFile and Image statements

Browse source
This commit is contained in:
Dan Paulat 2023-10-09 23:36:21 -05:00
parent c5a56680ea
commit 8326b2f2bf
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scwx-qt/source/scwx/qt/gl/draw/placefile_images.cpp
View file

@ -3,6 +3,7 @@
#include <scwx/qt/util/texture_atlas.hpp>
#include <scwx/util/logger.hpp>
#include <QDir>
#include <QUrl>
#include <boost/unordered/unordered_flat_map.hpp>
@ -39,8 +40,9 @@ struct PlacefileImageInfo
{
// Resolve using base URL
auto baseUrl = QUrl::fromUserInput(QString::fromStdString(baseUrlString));
auto relativeUrl = QUrl(QString::fromStdString(imageFile));
resolvedUrl_ = baseUrl.resolved(relativeUrl).toString().toStdString();
auto relativeUrl =
QUrl(QDir::fromNativeSeparators(QString::fromStdString(imageFile)));
resolvedUrl_ = baseUrl.resolved(relativeUrl).toString().toStdString();
}
void UpdateTextureInfo();