Fixes crash when user could click download on an asset before fully loaded.

Author: FiniteSingularity

CMakeLists.txt

@@ -34,7 +34,7 @@ function(setup_obs_lib_dependency target)
   endif()
 endfunction()
 
-project(elgato-deeplinking VERSION 0.0.1)
+project(elgato-marketplace VERSION 0.0.2)
 
 if(${CMAKE_PROJECT_NAME} STREQUAL "obs-studio")
   set(OBS_FRONTEND_API_NAME "frontend-api")

buildspec.json

@@ -35,12 +35,12 @@
     },
     "platformConfig": {
         "macos": {
-            "bundleId": "com.elgato.deeplinking"
+            "bundleId": "com.elgato.marketplace-plugin"
         }
     },
-    "name": "elgato-deeplinking",
-    "displayName": "Elgato Deep Linking",
-    "version": "0.0.1",
+    "name": "elgato-marketplace",
+    "displayName": "Elgato Marketplace Plugin",
+    "version": "0.0.2",
     "author": "Elgato",
     "website": "https://elgato.com",
     "email": "support@elgato.com",

src/elgato-cloud-data.cpp

@@ -111,6 +111,17 @@ void ElgatoCloud::_Listen()
 		listen_on_pipe("elgato_cloud", [this](std::string d) {
 			obs_log(LOG_INFO, "Got Deeplink %s", d.c_str());
 			if (d.find("elgatoobs://auth") == 0) {
+				if (mainWindowOpen && window) {
+					QMetaObject::invokeMethod(
+						QCoreApplication::instance()->thread(),
+						[this]() {
+							window->setLoading();
+							window->show();
+							window->raise();
+							window->activateWindow();
+						});
+				}
+
 				obs_log(LOG_INFO, "auth detected");
 				std::unique_lock lock(m);
 				if (!authorizing) {
@@ -250,10 +261,19 @@ void ElgatoCloud::LoadPurchasedProducts()
 	if (!loggedIn) {
 		return;
 	}
-
+	loading = true;
 	// Todo- only refresh token if it needs refreshing
 	_TokenRefresh(false);
 
+	if (mainWindowOpen && window) {
+		QMetaObject::invokeMethod(
+			QCoreApplication::instance()->thread(),
+			[this]() {
+				window->setLoading();
+			});
+	}
+
+
 	auto api = MarketplaceApi::getInstance();
 	std::string api_url = api->gatewayUrl();
 	api_url += "/my-products?extension=overlays&offset=0&limit=100";
@@ -362,6 +382,9 @@ void ElgatoCloud::_LoadUserData(bool loadData)
 			QMetaObject::invokeMethod(
 				QCoreApplication::instance()->thread(),
 				[this, loadData]() {
+					if (loadData) {
+						loading = true;
+					}
 					window->setLoggedIn();
 					if (loadData) {
 						LoadPurchasedProducts();

src/elgato-cloud-window.cpp

@@ -102,11 +102,13 @@ DownloadButton::DownloadButton(QWidget *parent) : QWidget(parent)
 	_downloadButton->setToolTip("Click to Download");
 	std::string downloadIconPath = imageBaseDir + "download.svg";
 	std::string downloadIconHoverPath = imageBaseDir + "download_hover.svg";
-	std::string downloadIconDisabledPath = imageBaseDir + "download_hover.svg";
+	std::string downloadIconDisabledPath =
+		imageBaseDir + "download_hover.svg";
 	QString buttonStyle = EIconHoverDisabledButtonStyle;
 	buttonStyle.replace("${img}", downloadIconPath.c_str());
 	buttonStyle.replace("${hover-img}", downloadIconHoverPath.c_str());
-	buttonStyle.replace("${disabled-img}", downloadIconDisabledPath.c_str());
+	buttonStyle.replace("${disabled-img}",
+			    downloadIconDisabledPath.c_str());
 	_downloadButton->setFixedSize(24, 24);
 	_downloadButton->setStyleSheet(buttonStyle);
 	_downloadButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
@@ -247,7 +249,8 @@ WindowToolBar::WindowToolBar(QWidget *parent) : QWidget(parent)
 	std::string settingsIconHoverPath = imageBaseDir + "settings_hover.svg";
 	QString settingsButtonStyle = EIconHoverButtonStyle;
 	settingsButtonStyle.replace("${img}", settingsIconPath.c_str());
-	settingsButtonStyle.replace("${hover-img}", settingsIconHoverPath.c_str());
+	settingsButtonStyle.replace("${hover-img}",
+				    settingsIconHoverPath.c_str());
 	_settingsButton->setFixedSize(24, 24);
 	_settingsButton->setMaximumHeight(24);
 	_settingsButton->setStyleSheet(settingsButtonStyle);
@@ -260,7 +263,8 @@ WindowToolBar::WindowToolBar(QWidget *parent) : QWidget(parent)
 	_storeButton = new QPushButton(this);
 	_storeButton->setToolTip("Go to Elgato Marketplace");
 	std::string storeIconPath = imageBaseDir + "marketplace-logo.svg";
-	std::string storeIconHoverPath = imageBaseDir + "marketplace-logo_hover.svg";
+	std::string storeIconHoverPath =
+		imageBaseDir + "marketplace-logo_hover.svg";
 	QString buttonStyle = EIconHoverButtonStyle;
 	buttonStyle.replace("${img}", storeIconPath.c_str());
 	buttonStyle.replace("${hover-img}", storeIconHoverPath.c_str());
@@ -492,7 +496,6 @@ void ElgatoCloudWindow::initialize()
 
 	auto loadingWidget = new LoadingWidget(this); // Loading widget, id: 3
 	_stackedContent->addWidget(loadingWidget);
-
 	//_config = new ElgatoCloudConfig(this);
 	//_config->setVisible(false);
 	connect(_config, &ElgatoCloudConfig::closeClicked, this, [this]() {
@@ -509,6 +512,11 @@ void ElgatoCloudWindow::initialize()
 	setLayout(_layout);
 }
 
+void ElgatoCloudWindow::setLoading()
+{
+	_stackedContent->setCurrentIndex(3);
+}
+
 void ElgatoCloudWindow::on_logInButton_clicked()
 {
 	elgatoCloud->StartLogin();
@@ -536,6 +544,7 @@ void ElgatoCloudWindow::setLoggedIn()
 void ElgatoCloudWindow::setupOwnedProducts()
 {
 	_ownedProducts->refreshProducts();
+	_stackedContent->setCurrentIndex(0);
 }
 
 ElgatoProductItem::ElgatoProductItem(QWidget *parent, ElgatoProduct *product)
@@ -743,7 +752,7 @@ LoadingWidget::LoadingWidget(QWidget *parent) : QWidget(parent)
 				 QSizePolicy::Expanding);
 
 	auto loading = new QLabel(this);
-	loading->setText("Loading all of the things");
+	loading->setText("Loading Your Purchased Products...");
 	loading->setStyleSheet("QLabel {font-size: 18pt;}");
 	loading->setAlignment(Qt::AlignCenter);
 
@@ -772,6 +781,9 @@ void OpenElgatoCloudWindow()
 
 		ElgatoCloudWindow::window = new ElgatoCloudWindow(mainWindow);
 		ElgatoCloudWindow::window->setAttribute(Qt::WA_DeleteOnClose);
+		if (elgatoCloud->loggedIn) {
+			ElgatoCloudWindow::window->setLoading();
+		}
 		ElgatoCloudWindow::window->show();
 		ElgatoCloudWindow::window->move(
 			hostRect.center() -
@@ -793,7 +805,7 @@ void CloseElgatoCloudWindow()
 
 extern void InitElgatoCloud(obs_module_t *module)
 {
-	obs_log(LOG_INFO, "version: %s", "0.0.1");
+	obs_log(LOG_INFO, "version: %s", "0.0.2");
 
 	elgatoCloud = new ElgatoCloud(module);
 	QAction *action = (QAction *)obs_frontend_add_tools_menu_qaction(

src/elgato-cloud-window.hpp

@@ -203,6 +203,7 @@ class ElgatoCloudWindow : public QDialog {
 
 	void initialize();
 	void setLoggedIn();
+	void setLoading();
 	void setupOwnedProducts();
 
 	static ElgatoCloudWindow *window;

src/export-wizard.cpp

@@ -12,7 +12,7 @@
 
 namespace elgatocloud {
 
-SceneBundle* bundle = new SceneBundle();
+SceneBundle *bundle = new SceneBundle();
 
 SceneBundleStatus createBundle(std::string filename,
 			       std::vector<std::string> plugins,
@@ -36,7 +36,7 @@ const std::vector<std::string> ExcludedModules{
 	"frontend-tools.dll", "decklink-output-ui.dll", "decklink-captions.dll",
 	"coreaudio-encoder.dll",
 	// This plugin
-	"elgato-deeplinking.dll"};
+	"elgato-marketplace.dll"};
 
 FileCollectionCheck::FileCollectionCheck(QWidget *parent,
 					 std::vector<std::string> files)

src/plugin-support.c

@@ -20,8 +20,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 extern void blogva(int log_level, const char *format, va_list args);
 
-const char *PLUGIN_NAME = "deeplinking";
-const char *PLUGIN_VERSION = "0.0.1";
+const char *PLUGIN_NAME = "elgato-marketplace";
+const char *PLUGIN_VERSION = "0.0.2";
 
 void obs_log(int log_level, const char *format, ...)
 {