History

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

Sam Gateau committed 12 years ago

Commit 5f0fdec2 parents b716a51 da7558e5 files · +14 −13Browse files

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

Unified · Split

interface/src/Application.cpp+2−4
@@ -839,14 +839,12 @@ void Application::controlledBroadcastToNodes(const QByteArray& packet, const Nod · 838 unmodified lines
839}839}
840 840
841bool Application::event(QEvent* event) {841bool Application::event(QEvent* event) {
842
843 // handle custom URL842 // handle custom URL
844 if (event->type() == QEvent::FileOpen) {843 if (event->type() == QEvent::FileOpen) {
845 844
846 QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);845 QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);
847 846 if (fileEvent->url().isValid()) {
848 if (!fileEvent->url().isEmpty()) {847 openUrl(fileEvent->url());
849 AddressManager::getInstance().handleLookupString(fileEvent->url().toLocalFile());
850 }848 }
851 849
852 return false;850 return false;

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