frontend: Make OBSAbout self contained

This makes it so OBSAbout isn't tangled with OBSBasic.

Author: cg2121

frontend/dialogs/OBSAbout.cpp

@@ -1,14 +1,18 @@
 #include "OBSAbout.hpp"
-
-#include <widgets/OBSBasic.hpp>
+#include <OBSApp.hpp>
 #include <utility/RemoteTextThread.hpp>
+#include <utility/platform.hpp>
 
 #include <qt-wrappers.hpp>
 
 #include <json11.hpp>
 
 #include "moc_OBSAbout.cpp"
 
+namespace {
+QString patronJson;
+} // namespace
+
 using namespace json11;
 
 extern bool steam;
@@ -62,30 +66,40 @@ OBSAbout::OBSAbout(QWidget *parent) : QDialog(parent), ui(new Ui::OBSAbout)
 	connect(ui->authors, &ClickableLabel::clicked, this, &OBSAbout::ShowAuthors);
 	connect(ui->license, &ClickableLabel::clicked, this, &OBSAbout::ShowLicense);
 
-	QPointer<OBSAbout> about(this);
-
-	OBSBasic *main = OBSBasic::Get();
-	if (main->patronJson.empty() && !main->patronJsonThread) {
+	if (patronJson.isEmpty()) {
 		RemoteTextThread *thread =
 			new RemoteTextThread("https://obsproject.com/patreon/about-box.json", "application/json");
-		QObject::connect(thread, &RemoteTextThread::Result, main, &OBSBasic::UpdatePatronJson);
-		QObject::connect(thread, &RemoteTextThread::Result, this, &OBSAbout::ShowAbout);
-		main->patronJsonThread.reset(thread);
+		connect(thread, &RemoteTextThread::Result, this, &OBSAbout::updatePatronJson);
+		patronJsonThread.reset(thread);
 		thread->start();
 	} else {
 		ShowAbout();
 	}
 }
 
-void OBSAbout::ShowAbout()
+OBSAbout::~OBSAbout()
 {
-	OBSBasic *main = OBSBasic::Get();
+	if (patronJsonThread && patronJsonThread->isRunning())
+		patronJsonThread->wait();
+}
 
-	if (main->patronJson.empty())
+void OBSAbout::updatePatronJson(const QString &text, const QString &error)
+{
+	if (!error.isEmpty())
+		return;
+
+	patronJson = text;
+
+	ShowAbout();
+}
+
+void OBSAbout::ShowAbout()
+{
+	if (patronJson.isEmpty())
 		return;
 
 	std::string error;
-	Json json = Json::parse(main->patronJson, error);
+	Json json = Json::parse(patronJson.toStdString(), error);
 	const Json::array &patrons = json.array_items();
 	QString text;
 

frontend/dialogs/OBSAbout.hpp

@@ -7,13 +7,19 @@
 class OBSAbout : public QDialog {
 	Q_OBJECT
 
+private:
+	QScopedPointer<QThread> patronJsonThread;
+
 public:
 	explicit OBSAbout(QWidget *parent = 0);
+	~OBSAbout();
 
 	std::unique_ptr<Ui::OBSAbout> ui;
 
 private slots:
 	void ShowAbout();
 	void ShowAuthors();
 	void ShowLicense();
+
+	void updatePatronJson(const QString &text, const QString &error);
 };

frontend/widgets/OBSBasic.cpp

@@ -1397,9 +1397,6 @@ void OBSBasic::applicationShutdown() noexcept
 	if (updateCheckThread && updateCheckThread->isRunning())
 		updateCheckThread->wait();
 
-	if (patronJsonThread && patronJsonThread->isRunning())
-		patronJsonThread->wait();
-
 	delete screenshotData;
 	delete previewProjector;
 	delete studioProgramProjector;
@@ -2085,14 +2082,6 @@ OBSBasic *OBSBasic::Get()
 	return reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
 }
 
-void OBSBasic::UpdatePatronJson(const QString &text, const QString &error)
-{
-	if (!error.isEmpty())
-		return;
-
-	patronJson = QT_TO_UTF8(text);
-}
-
 void OBSBasic::SetDisplayAffinity(QWindow *window)
 {
 	if (!SetDisplayAffinitySupported())

frontend/widgets/OBSBasic.hpp

@@ -217,7 +217,6 @@ class OBSBasic : public OBSMainWindow {
 	Q_PROPERTY(QIcon audioProcessOutputIcon READ GetAudioProcessOutputIcon WRITE SetAudioProcessOutputIcon
 			   DESIGNABLE true)
 
-	friend class OBSAbout;
 	friend class OBSBasicPreview;
 	friend class OBSBasicStatusBar;
 	friend class OBSBasicSourceSelect;
@@ -272,9 +271,6 @@ class OBSBasic : public OBSMainWindow {
 
 	ConfigFile activeConfiguration;
 
-	QScopedPointer<QThread> patronJsonThread;
-	std::string patronJson;
-
 	std::unique_ptr<Ui::OBSBasic> ui;
 
 	void OnEvent(enum obs_frontend_event event);
@@ -302,7 +298,6 @@ class OBSBasic : public OBSMainWindow {
 
 public slots:
 	void close();
-	void UpdatePatronJson(const QString &text, const QString &error);
 	void UpdateEditMenu();
 	void applicationShutdown() noexcept;