History

Fix marketplace imports failing silently if edit.js not running

Ryan Huffman committed 10 years ago

Commit acf96a41 parent 6db82392 files · +14 −4Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 2 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+12−1
@@ -34,8 +34,19 @@ WindowScriptingInterface::WindowScriptingInterface() : · 33 unmodified lines
3434 {
3535 const DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
3636 connect(&domainHandler, &DomainHandler::connectedToDomain, this, &WindowScriptingInterface::domainChanged);
37− connect(qApp, &Application::svoImportRequested, this, &WindowScriptingInterface::svoImportRequested);
3837 connect(qApp, &Application::domainConnectionRefused, this, &WindowScriptingInterface::domainConnectionRefused);
38+
39+ connect(qApp, &Application::svoImportRequested, [this](const QString& urlString) {
40+ static const QMetaMethod svoImportRequestedSignal =
41+ QMetaMethod::fromSignal(&WindowScriptingInterface::svoImportRequested);
42+
43+ if (isSignalConnected(svoImportRequestedSignal)) {
44+ QUrl url(urlString);
45+ emit svoImportRequested(url.url());
46+ } else {
47+ OffscreenUi::warning("Import SVO Error", "You need to be running edit.js to import entities.");
48+ }
49+ });
3950 }
4051
4152 WebWindowClass* WindowScriptingInterface::doCreateWebWindow(const QString& title, const QString& url, int width, int height) {