diff options
| author | Silarn <jrim@rimpo.org> | 2018-04-16 12:48:52 -0500 |
|---|---|---|
| committer | Silarn <jrim@rimpo.org> | 2018-04-16 12:48:52 -0500 |
| commit | 332cdc155afa5cb27b484b81564e76b428e4c55e (patch) | |
| tree | 60f7bf9155445f87f07bd0ab8ae7290f493ef4e5 | |
| parent | 30c177cb371e92fe5e4cfc600cf27586402cf0a8 (diff) | |
| parent | fa104b342f440a4fc1c80426e2b5e2c5905d4151 (diff) | |
Merge branch 'Develop' of https://github.com/Modorganizer2/modorganizer into Develop
| -rw-r--r-- | src/organizercore.cpp | 9 | ||||
| -rw-r--r-- | src/selfupdater.cpp | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 3248a8e0..1f6d665f 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -1238,12 +1238,17 @@ HANDLE OrganizerCore::spawnBinaryProcess(const QFileInfo &binary, if (virtualizedCwd || virtualizedBin) {
if (virtualizedCwd) {
int cwdOffset = cwdPath.indexOf('/', modsPath.length() + 1);
- cwdPath = m_GamePlugin->dataDirectory().absolutePath() + cwdPath.mid(cwdOffset, -1);
+ cwdPath = m_GamePlugin->dataDirectory().absolutePath();
+ if (cwdOffset >= 0)
+ cwdPath += cwdPath.mid(cwdOffset, -1);
+
}
if (virtualizedBin) {
int binOffset = binPath.indexOf('/', modsPath.length() + 1);
- binPath = m_GamePlugin->dataDirectory().absolutePath() + binPath.mid(binOffset, -1);
+ binPath = m_GamePlugin->dataDirectory().absolutePath();
+ if (binOffset>= 0)
+ binPath += binPath.mid(binOffset, -1);
}
QString cmdline
diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp index debf9106..d671bafc 100644 --- a/src/selfupdater.cpp +++ b/src/selfupdater.cpp @@ -176,10 +176,10 @@ void SelfUpdater::startUpdate() QMessageBox query(QMessageBox::Question,
tr("New update available (%1)")
- .arg(m_UpdateCandidate["tag_name"].toString()),
- BBCode::convertToHTML(m_UpdateCandidate["body"].toString()),
+ .arg(m_UpdateCandidate["tag_name"].toString()), tr("Do you want to install update? All your mods and setup will be left untouched.\nSelect Show Details option to see the full change-log."),
QMessageBox::Yes | QMessageBox::Cancel, m_Parent);
-
+
+ query.setDetailedText(m_UpdateCandidate["body"].toString());
query.button(QMessageBox::Yes)->setText(tr("Install"));
int res = query.exec();
|