History

fixed merge issues

Dante Ruiz committed 9 years ago

Commit 628b97b2 parents afd56bb 896f9d73 files · +4 −4Browse files

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

Unified · Split

interface/src/Application.cpp+0−1
@@ -5745,7 +5745,6 @@ bool Application::displayAvatarAttachmentConfirmationDialog(const QString& name) · 5744 unmodified lines
5745 5745
5746void Application::toggleRunningScriptsWidget() const {5746void Application::toggleRunningScriptsWidget() const {
5747 DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");5747 DependencyManager::get<OffscreenUi>()->show(url, "RunningScripts");
5748
5749 //if (_runningScriptsWidget->isVisible()) {5748 //if (_runningScriptsWidget->isVisible()) {
5750 // if (_runningScriptsWidget->hasFocus()) {5749 // if (_runningScriptsWidget->hasFocus()) {
5751 // _runningScriptsWidget->hide();5750 // _runningScriptsWidget->hide();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t