History

Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2

Wayne Chen committed 7 years ago

Commit 5f658b92 parents d55c946 e0eba2113 files · +68 −46Browse files

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

Unified · Split

interface/src/Application.cpp+3−3
@@ -8101,9 +8101,9 @@ void Application::loadDomainConnectionDialog() { · 8100 unmodified lines
8101}8101}
8102 8102
8103void Application::toggleLogDialog() {8103void Application::toggleLogDialog() {
8104 //if (getLoginDialogPoppedUp()) {8104 if (getLoginDialogPoppedUp()) {
8105 // return;8105 return;
8106 //}8106 }
8107 if (! _logDialog) {8107 if (! _logDialog) {
8108 _logDialog = new LogDialog(nullptr, getLogger());8108 _logDialog = new LogDialog(nullptr, getLogger());
8109 }8109 }

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