From cc2c4cc9187de096db2cf2e4cf5f00cfbe4f7064 Mon Sep 17 00:00:00 2001 From: Al12rs Date: Sun, 15 Apr 2018 02:35:06 +0200 Subject: Fix for programs set to start from inside the top level of a mod folder not launching. --- src/organizercore.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 999c7732..20a16d35 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -1232,12 +1232,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 -- cgit v1.3.1 From fa104b342f440a4fc1c80426e2b5e2c5905d4151 Mon Sep 17 00:00:00 2001 From: Al12rs Date: Sun, 15 Apr 2018 02:54:16 +0200 Subject: Moved the Changelog to the detailed text to avoid the msgbox going below the scree. The readability is not graeat as QMessageBox does not allow resizing for some petty reason. --- src/selfupdater.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp index 8f962ba4..9706e1fb 100644 --- a/src/selfupdater.cpp +++ b/src/selfupdater.cpp @@ -170,10 +170,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(); -- cgit v1.3.1