History

Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature

Atlante45 committed 12 years ago

Commit 47685b02 parents 3cc18d1 5ca289025 files · +1521 −574Browse files

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

Unified · Split

interface/src/Application.cpp+1−2
@@ -814,9 +814,8 @@ bool Application::event(QEvent* event) { · 813 unmodified lines
814814 QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);
815815 bool isHifiSchemeURL = !fileEvent->url().isEmpty() && fileEvent->url().toLocalFile().startsWith(CUSTOM_URL_SCHEME);
816816 if (isHifiSchemeURL) {
817− Menu::getInstance()->goTo(fileEvent->url().toString());
817+ Menu::getInstance()->goToURL(fileEvent->url().toLocalFile());
818818 }
819−
820819 return false;
821820 }
822821 return QApplication::event(event);

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