Merge remote-tracking branch 'ZackHaber-upstream/new_vfs_library' into new_vfs_library

2 files changed, 10 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index c5c631d8..9697e53c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ src/moc_*.cpp
 src/ui_*.h
 src/*.qrc.depends
 src/Modorganizer.*
+src/*.bak
 CMakeLists.txt.user
 edit
 stderr.log
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f554f0aa..c9b62945 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -4229,6 +4229,9 @@ void MainWindow::on_bossButton_clicked()
   std::string errorMessages;

 

   m_OrganizerCore.currentProfile()->writeModlistNow();

+  //Create a backup of the load orders w/ LOOT in name

+  //to make sure that any sorting is easily undo-able.

+  //Need to figure out how I want to do that.

 

   bool success = false;

 

@@ -4241,19 +4244,15 @@ void MainWindow::on_bossButton_clicked()
     dialog.show();

 

     QString outPath = QDir::temp().absoluteFilePath("lootreport.json");

-

+   

     QStringList parameters;

-    parameters << "--unattended"

-               << "--stdout"

-               << "--noreport"

-               << "--game" << m_OrganizerCore.managedGame()->gameShortName()

+    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" << outPath;

 

     if (m_DidUpdateMasterList) {

       parameters << "--skipUpdateMasterlist";

-    } else {

-      m_DidUpdateMasterList = true;

     }

     HANDLE stdOutWrite = INVALID_HANDLE_VALUE;

     HANDLE stdOutRead = INVALID_HANDLE_VALUE;

@@ -4369,7 +4368,8 @@ void MainWindow::on_bossButton_clicked()
   }

 

   if (success) {

-    if (reportURL.length() > 0) {

+    m_DidUpdateMasterList = true;

+    /*if (reportURL.length() > 0) {

       m_IntegratedBrowser.setWindowTitle("LOOT Report");

       QString report(reportURL.c_str());

       QStringList temp = report.split("?");

@@ -4378,7 +4378,7 @@ 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.