From d58f773c76fb9e9542f371252932ec04a022f309 Mon Sep 17 00:00:00 2001
From: Chris Bessent <lost.dragonist@gmail.com>
Date: Thu, 25 Nov 2021 13:00:15 -0700
Subject: Don't blacklist empty usernames and passwords

---
 src/organizer_en.ts               | 22 +++++++++++-----------
 src/settingsdialogworkarounds.cpp |  6 ++++--
 src/spawn.cpp                     |  6 ++++--
 3 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/organizer_en.ts b/src/organizer_en.ts
index 498dfd63..1d56d0f8 100644
--- a/src/organizer_en.ts
+++ b/src/organizer_en.ts
@@ -7362,7 +7362,7 @@ This program is known to cause issues with Mod Organizer, such as freezing or bl
         <location filename="spawn.cpp" line="366"/>
         <location filename="spawn.cpp" line="393"/>
         <location filename="spawn.cpp" line="429"/>
-        <location filename="settingsdialogworkarounds.cpp" line="137"/>
+        <location filename="settingsdialogworkarounds.cpp" line="139"/>
         <location filename="settingsdialognexus.cpp" line="268"/>
         <location filename="settingsdialognexus.cpp" line="276"/>
         <location filename="createinstancedialogpages.cpp" line="680"/>
@@ -7455,12 +7455,12 @@ This program is known to cause issues with Mod Organizer, such as freezing or bl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogworkarounds.cpp" line="86"/>
+        <location filename="settingsdialogworkarounds.cpp" line="88"/>
         <source>Executables Blacklist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogworkarounds.cpp" line="87"/>
+        <location filename="settingsdialogworkarounds.cpp" line="89"/>
         <source>Enter one executable per line to be blacklisted from the virtual file system.
 Mods and other virtualized files will not be visible to these executables and
 any executables launched by them.
@@ -7471,14 +7471,14 @@ Example:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogworkarounds.cpp" line="132"/>
-        <location filename="settingsdialogworkarounds.cpp" line="133"/>
-        <location filename="settingsdialogworkarounds.cpp" line="136"/>
+        <location filename="settingsdialogworkarounds.cpp" line="134"/>
+        <location filename="settingsdialogworkarounds.cpp" line="135"/>
+        <location filename="settingsdialogworkarounds.cpp" line="138"/>
         <source>Restart Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogworkarounds.cpp" line="134"/>
+        <location filename="settingsdialogworkarounds.cpp" line="136"/>
         <source>Geometries will be reset to their default values.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7682,22 +7682,22 @@ You can restart Mod Organizer as administrator and try launching the program aga
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="658"/>
+        <location filename="spawn.cpp" line="660"/>
         <source>Waiting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="659"/>
+        <location filename="spawn.cpp" line="661"/>
         <source>Please press OK once you&apos;re logged into steam.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="967"/>
+        <location filename="spawn.cpp" line="969"/>
         <source>Select binary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="968"/>
+        <location filename="spawn.cpp" line="970"/>
         <source>Binary</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/settingsdialogworkarounds.cpp b/src/settingsdialogworkarounds.cpp
index df87aa16..cf54908a 100644
--- a/src/settingsdialogworkarounds.cpp
+++ b/src/settingsdialogworkarounds.cpp
@@ -17,8 +17,10 @@ WorkaroundsSettingsTab::WorkaroundsSettingsTab(Settings& s, SettingsDialog& d)
   // steam
   QString username, password;
   settings().steam().login(username, password);
-  MOBase::log::getDefault().addToBlacklist(username.toStdString(), "STEAM_USERNAME");
-  MOBase::log::getDefault().addToBlacklist(password.toStdString(), "STEAM_PASSWORD");
+  if (username.length() > 0)
+    MOBase::log::getDefault().addToBlacklist(username.toStdString(), "STEAM_USERNAME");
+  if (password.length() > 0)
+    MOBase::log::getDefault().addToBlacklist(password.toStdString(), "STEAM_PASSWORD");
 
   ui->appIDEdit->setText(settings().steam().appID());
   ui->steamUserEdit->setText(username);
diff --git a/src/spawn.cpp b/src/spawn.cpp
index 4f1fdd3e..fbd4c286 100644
--- a/src/spawn.cpp
+++ b/src/spawn.cpp
@@ -625,8 +625,10 @@ bool startSteam(QWidget* parent)
   // See if username and password supplied. If so, pass them into steam.
   QString username, password;
   if (Settings::instance().steam().login(username, password)) {
-    MOBase::log::getDefault().addToBlacklist(username.toStdString(), "STEAM_USERNAME");
-    MOBase::log::getDefault().addToBlacklist(password.toStdString(), "STEAM_PASSWORD");
+    if (username.length() > 0)
+      MOBase::log::getDefault().addToBlacklist(username.toStdString(), "STEAM_USERNAME");
+    if (password.length() > 0)
+      MOBase::log::getDefault().addToBlacklist(password.toStdString(), "STEAM_PASSWORD");
     sp.arguments = makeSteamArguments(username, password);
   }
 
-- 
cgit v1.3.1