Remove hardcode of AppEnv, folder detect now properly
This commit is contained in:
parent
3be2e49d5c
commit
601552dc26
2 changed files with 27 additions and 13 deletions
23
AppEnv.cpp
23
AppEnv.cpp
|
@ -37,7 +37,7 @@ AppEnv::AppEnv()
|
||||||
QString AppEnv::getGameFolder(bool *ok)
|
QString AppEnv::getGameFolder(bool *ok)
|
||||||
{
|
{
|
||||||
QDir dir;
|
QDir dir;
|
||||||
QString GTAV_FOLDER(qgetenv("GTAV_FOLDER"));
|
QString GTAV_FOLDER = QString::fromUtf8(qgetenv("GTAV_FOLDER"));
|
||||||
if (GTAV_FOLDER != "")
|
if (GTAV_FOLDER != "")
|
||||||
{
|
{
|
||||||
dir.setPath(GTAV_FOLDER);
|
dir.setPath(GTAV_FOLDER);
|
||||||
|
@ -52,15 +52,14 @@ QString AppEnv::getGameFolder(bool *ok)
|
||||||
QString GTAV_defaultFolder = StandardPaths::documentsLocation() + QDir::separator() + "Rockstar Games" + QDir::separator() + "GTA V";
|
QString GTAV_defaultFolder = StandardPaths::documentsLocation() + QDir::separator() + "Rockstar Games" + QDir::separator() + "GTA V";
|
||||||
QString GTAV_returnFolder = GTAV_defaultFolder;
|
QString GTAV_returnFolder = GTAV_defaultFolder;
|
||||||
|
|
||||||
QSettings SyncSettings("Syping", "gta5sync");
|
QSettings SyncSettings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR);
|
||||||
SyncSettings.beginGroup("dir");
|
SyncSettings.beginGroup("dir");
|
||||||
bool forceDir = SyncSettings.value("force", false).toBool();
|
bool forceDir = SyncSettings.value("force", false).toBool();
|
||||||
if (forceDir)
|
|
||||||
{
|
|
||||||
GTAV_returnFolder = SyncSettings.value("dir", GTAV_defaultFolder).toString();
|
GTAV_returnFolder = SyncSettings.value("dir", GTAV_defaultFolder).toString();
|
||||||
}
|
|
||||||
SyncSettings.endGroup();
|
SyncSettings.endGroup();
|
||||||
|
|
||||||
|
if (forceDir)
|
||||||
|
{
|
||||||
dir.setPath(GTAV_returnFolder);
|
dir.setPath(GTAV_returnFolder);
|
||||||
if (dir.exists())
|
if (dir.exists())
|
||||||
{
|
{
|
||||||
|
@ -68,6 +67,7 @@ QString AppEnv::getGameFolder(bool *ok)
|
||||||
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
||||||
return dir.absolutePath();
|
return dir.absolutePath();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dir.setPath(GTAV_defaultFolder);
|
dir.setPath(GTAV_defaultFolder);
|
||||||
if (dir.exists())
|
if (dir.exists())
|
||||||
|
@ -77,6 +77,17 @@ QString AppEnv::getGameFolder(bool *ok)
|
||||||
return dir.absolutePath();
|
return dir.absolutePath();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!forceDir)
|
||||||
|
{
|
||||||
|
dir.setPath(GTAV_returnFolder);
|
||||||
|
if (dir.exists())
|
||||||
|
{
|
||||||
|
if (ok != 0) *ok = true;
|
||||||
|
qputenv("GTAV_FOLDER", dir.absolutePath().toUtf8());
|
||||||
|
return dir.absolutePath();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (ok != 0) *ok = false;
|
if (ok != 0) *ok = false;
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
@ -107,7 +118,7 @@ QString AppEnv::getPluginsFolder()
|
||||||
|
|
||||||
QByteArray AppEnv::getUserAgent()
|
QByteArray AppEnv::getUserAgent()
|
||||||
{
|
{
|
||||||
return QString("Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Firefox/45.0 gta5sync/1.0").toUtf8();
|
return QString("Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Firefox/45.0 %1/%2").arg(GTA5SYNC_APPSTR, GTA5SYNC_APPVER).toUtf8();
|
||||||
}
|
}
|
||||||
|
|
||||||
QUrl AppEnv::getCrewFetchingUrl(QString crewID)
|
QUrl AppEnv::getCrewFetchingUrl(QString crewID)
|
||||||
|
|
|
@ -338,8 +338,11 @@ bool SnapmaticPicture::setPicture(const QImage &picture)
|
||||||
}
|
}
|
||||||
int result = snapmaticStream.write(picByteArray);
|
int result = snapmaticStream.write(picByteArray);
|
||||||
if (result != 0)
|
if (result != 0)
|
||||||
|
{
|
||||||
|
if (cacheEnabled)
|
||||||
{
|
{
|
||||||
cachePicture = picture;
|
cachePicture = picture;
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in a new issue