History

refreshing with master

Dante Ruiz committed 9 years ago

Commit 896f9d71 parent e6853a91 file · +2 −5Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Application.cpp+2−5
@@ -5744,13 +5744,10 @@ bool Application::displayAvatarAttachmentConfirmationDialog(const QString& name) · 5743 unmodified lines
5744 5744
5745void Application::toggleRunningScriptsWidget() const {5745void Application::toggleRunningScriptsWidget() const {
5746 auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();5746 auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
5747 auto tabletWindow = tabletScriptingInterface->getTabletWindow();
5748 static const QUrl url("hifi/dialogs/RunningScripts.qml");5747 static const QUrl url("hifi/dialogs/RunningScripts.qml");
5749 if (tabletWindow) {5748 if (true) {
5750 auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));5749 auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
5751 if (tablet) {5750 tablet->pushOntoStack("../..//hifi/dialogs/RunningScripts.qml");
5752 tablet->pushOntoStack("../..//hifi/dialogs/RunningScripts.qml");
5753 }
5754 } else {5751 } else {
5755 DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");5752 DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");
5756 }5753 }