Fixes avatar and product thumbnail loading bugs.

Author: FiniteSingularity

src/elgato-cloud-window.cpp

@@ -409,6 +409,15 @@ void ProductGrid::enableDownload()
 	}
 }
 
+void ProductGrid::resetDownloads()
+{
+	for (int i = 0; i < layout()->count(); ++i) {
+		auto item = dynamic_cast<ElgatoProductItem*>(
+			layout()->itemAt(i)->widget());
+		item->resetDownload();
+	}
+}
+
 void ProductGrid::closing() {
 	for (int i = 0; i < layout()->count(); ++i) {
 		auto item = dynamic_cast<ElgatoProductItem*>(
@@ -531,6 +540,11 @@ void OwnedProducts::closing()
 	_purchased->closing();
 }
 
+void OwnedProducts::resetDownloads()
+{
+	_purchased->resetDownloads();
+}
+
 ElgatoCloudWindow::ElgatoCloudWindow(QWidget *parent) : QDialog(parent)
 //ui(new Ui_ElgatoCloudWindow)
 {
@@ -608,7 +622,14 @@ void ElgatoCloudWindow::initialize()
 	_layout->addWidget(_mainWidget);
 
 	setLayout(_layout);
-	setFixedSize(970, 520);
+	setFixedSize(978, 520);
+}
+
+void ElgatoCloudWindow::resetDownloads()
+{
+	if (_ownedProducts) {
+		_ownedProducts->resetDownloads();
+	}
 }
 
 void ElgatoCloudWindow::setLoading()
@@ -874,7 +895,7 @@ void ProductThumbnail::updateButton_()
 
 void ProductThumbnail::setPixmap(const QPixmap& pixmap)
 {
-	_thumbnail->setPixmap(pixmap);
+	_thumbnail->setCustomPixmap(pixmap);
 }
 
 bool ProductThumbnail::event(QEvent* e)
@@ -992,6 +1013,10 @@ ElgatoProductItem::ElgatoProductItem(QWidget *parent, ElgatoProduct *product)
 			p->enableDownload();
 			resetDownload();
 		}
+		else {
+			p->enableDownload();
+			resetDownload();
+		}
 	});
 
 	connect(_labelImg, &ProductThumbnail::cancelDownloadClicked, [this]() {
@@ -1049,6 +1074,7 @@ void ElgatoProductItem::updateImage()
 					: imageBaseDir + "image-loading.svg";
 	QPixmap image = _setupImage(imagePath);
 	_labelImg->setPixmap(image);
+	_labelImg->update();
 }
 
 QPixmap ElgatoProductItem::_setupImage(std::string imagePath)

src/elgato-cloud-window.hpp

@@ -206,6 +206,7 @@ class ProductGrid : public QWidget {
 	size_t loadProducts();
 	void disableDownload(ElgatoProductItem* skip = nullptr);
 	void enableDownload();
+	void resetDownloads();
 	void closing();
 
 private:
@@ -230,6 +231,7 @@ class OwnedProducts : public QWidget {
 
 	void refreshProducts();
 	void closing();
+	void resetDownloads();
 
 private:
 	QHBoxLayout *_layout = nullptr;
@@ -286,6 +288,7 @@ class ElgatoCloudWindow : public QDialog {
 	void setLoggedIn();
 	void setLoading();
 	void setupOwnedProducts();
+	void resetDownloads();
 
 	static ElgatoCloudWindow *window;
 

src/export-wizard.cpp

@@ -345,8 +345,9 @@ FileCollectionCheck::FileCollectionCheck(std::string name,
 		form->addWidget(fileList);
 	} else {
 		form->addStretch();
-		replace_all(titleLookup, "{COUNT}", std::to_string(0));
-		title->setText(titleLookup.c_str());
+		std::string titleText = obs_module_text(titleLookup.c_str());
+		replace_all(titleText, "{COUNT}", std::to_string(0));
+		title->setText(titleText.c_str());
 		title->setStyleSheet(EWizardStepTitle);
 		title->setAlignment(Qt::AlignCenter);
 

src/setup-wizard.cpp

@@ -42,6 +42,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <plugin-support.h>
 #include "setup-wizard.hpp"
 #include "elgato-product.hpp"
+#include "elgato-cloud-window.hpp"
 #include "scene-bundle.hpp"
 #include "obs-utils.hpp"
 #include "util.h"
@@ -983,7 +984,7 @@ StreamPackageSetupWizard::StreamPackageSetupWizard(QWidget *parent,
 StreamPackageSetupWizard::~StreamPackageSetupWizard()
 {
 	if (!_installStarted) { // We've not yet handed control over
-		                    // too install routine.
+		                    // to install routine.
 		if (_deleteOnClose) {
 			// Delete the scene collection file
 			os_unlink(_filename.c_str());
@@ -993,6 +994,10 @@ StreamPackageSetupWizard::~StreamPackageSetupWizard()
 			EnableVideoCaptureSourcesActive,
 			this);
 	}
+	auto elgatoCloudWindow = GetElgatoCloudWindow();
+	if (elgatoCloudWindow) {
+		elgatoCloudWindow->resetDownloads();
+	}
 	setupWizard = nullptr;
 }
 
@@ -1055,6 +1060,14 @@ void StreamPackageSetupWizard::OpenArchive()
 							}
 						}
 
+						// In case the setup wizard was closed while the
+						// archive was being extracted, stop execution before
+						// anything is called on the now null setupWizard pointer.
+						auto setupWizard = GetSetupWizard();
+						if (!setupWizard) {
+							return;
+						}
+
 						// Disable all video capture sources so that single-thread
 						// capture sources, such as the Elgato Facecam, can be properly
 						// selected in the wizard.  Will re-enable any disabled sources