summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy Rimpo <jrim@rimpo.org>2018-03-20 17:10:35 -0500
committerJeremy Rimpo <jrim@rimpo.org>2018-03-20 17:10:35 -0500
commit0c792d548f44f71cdd358b5811f5ed06196430d9 (patch)
tree2cae43d14143d0b1b442c19be69317f5c51fdd94 /src
parent336216ba9a7e07aad972708c862c1e7306f1c67d (diff)
Fix lootcli destroying loadorder on newer games
Diffstat (limited to 'src')
-rw-r--r--src/mainwindow.cpp15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8bb40072..e562b2f2 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -4668,13 +4668,9 @@ void MainWindow::on_bossButton_clicked()
QStringList parameters;
parameters << "--game" << m_OrganizerCore.managedGame()->gameShortName()
<< "--gamePath" << QString("\"%1\"").arg(m_OrganizerCore.managedGame()->gameDirectory().absolutePath())
+ << "--pluginListPath" << QString("\"%1/loadorder.txt\"").arg(m_OrganizerCore.profilePath())
<< "--out" << QString("\"%1\"").arg(outPath);
- if (m_OrganizerCore.managedGame()->loadOrderMechanism() == IPluginGame::LoadOrderMechanism::FileTime)
- parameters << "--pluginListPath" << QString("\"%1/loadorder.txt\"").arg(m_OrganizerCore.profilePath());
- else
- parameters << "--pluginListPath" << QString("\"%1/plugins.txt\"").arg(m_OrganizerCore.profilePath());
-
if (m_DidUpdateMasterList) {
parameters << "--skipUpdateMasterlist";
}
@@ -4793,7 +4789,7 @@ void MainWindow::on_bossButton_clicked()
if (success) {
m_DidUpdateMasterList = true;
- /*if (reportURL.length() > 0) {
+ if (reportURL.length() > 0) {
m_IntegratedBrowser.setWindowTitle("LOOT Report");
QString report(reportURL.c_str());
QStringList temp = report.split("?");
@@ -4802,13 +4798,6 @@ void MainWindow::on_bossButton_clicked()
url.setQuery(temp.at(1).toUtf8());
}
m_IntegratedBrowser.openUrl(url);
- }*/
-
- // if the game specifies load order by file time, our own load order file needs to be removed because it's outdated.
- // refreshESPList will then use the file time as the load order.
- if (m_OrganizerCore.managedGame()->loadOrderMechanism() != IPluginGame::LoadOrderMechanism::FileTime) {
- qDebug("removing loadorder.txt");
- QFile::remove(m_OrganizerCore.currentProfile()->getLoadOrderFileName());
}
m_OrganizerCore.refreshESPList();
m_OrganizerCore.savePluginList();