Merge pull request #13513 from vladest/double_asset_server_fix

Tablet Asset Server dialog was instantiated twice
This commit is contained in:
John Conklin II 2018-07-03 13:14:12 -07:00 committed by GitHub
commit 65daee2353
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -6983,7 +6983,9 @@ void Application::showAssetServerWidget(QString filePath) {
DependencyManager::get<OffscreenUi>()->show(url, "AssetServer", startUpload);
} else {
static const QUrl url("hifi/dialogs/TabletAssetServer.qml");
tablet->pushOntoStack(url);
if (!tablet->isPathLoaded(url)) {
tablet->pushOntoStack(url);
}
}
}