Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-09-23 22:34:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #475 from PhenomRetroShare/Fix_RSTextBrowser_loadRessource_OnWindows

Browse source 
Fix RsTextBrowser::loadRessource on Windows.
This commit is contained in:
Cyril Soler 2016-08-16 10:22:00 +02:00 • committed by GitHub
commit 4572dc650c
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/common/RSTextBrowser.cpp
View file

@ -1,5 +1,6 @@
#include <iostream> #include <iostream>
#include <QDir>
#include <QDesktopServices> #include <QDesktopServices>
#include <QPainter> #include <QPainter>
@ -84,8 +85,8 @@ QVariant RSTextBrowser::loadResource(int type, const QUrl &name)
// case 2: always trust the image if it comes from local Config or Data directories. // case 2: always trust the image if it comes from local Config or Data directories.
if(name.scheme().compare("file",Qt::CaseInsensitive)==0 && type == QTextDocument::ImageResource) { if(name.scheme().compare("file",Qt::CaseInsensitive)==0 && type == QTextDocument::ImageResource) {
if (name.path().startsWith(QString::fromUtf8(RsAccounts::ConfigDirectory().c_str()).prepend("/"),Qt::CaseInsensitive) if (name.path().startsWith(QDir(QString::fromUtf8(RsAccounts::ConfigDirectory().c_str())).absolutePath().prepend("/"),Qt::CaseInsensitive)
|| name.path().startsWith(QString::fromUtf8(RsAccounts::DataDirectory().c_str()).prepend("/"),Qt::CaseInsensitive)) || name.path().startsWith(QDir(QString::fromUtf8(RsAccounts::DataDirectory().c_str())).absolutePath().prepend("/"),Qt::CaseInsensitive))
return QTextBrowser::loadResource(type, name); return QTextBrowser::loadResource(type, name);
} }