Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -1640,7 +1640,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1639 unmodified lines | |||
| 1640 | audioClient->setMuted(!audioClient->isMuted()); | 1640 | audioClient->setMuted(!audioClient->isMuted()); |
| 1641 | } else if (action == controller::toInt(controller::Action::CYCLE_CAMERA)) { | 1641 | } else if (action == controller::toInt(controller::Action::CYCLE_CAMERA)) { |
| 1642 | cycleCamera(); | 1642 | cycleCamera(); |
| 1643 | } else if (action == controller::toInt(controller::Action::CONTEXT_MENU)) { | 1643 | } else if (action == controller::toInt(controller::Action::CONTEXT_MENU) && !isInterstitialMode()) { |
| 1644 | toggleTabletUI(); | 1644 | toggleTabletUI(); |
| 1645 | } else if (action == controller::toInt(controller::Action::RETICLE_X)) { | 1645 | } else if (action == controller::toInt(controller::Action::RETICLE_X)) { |
| 1646 | auto oldPos = getApplicationCompositor().getReticlePosition(); | 1646 | auto oldPos = getApplicationCompositor().getReticlePosition(); |
| @@ -7806,7 +7806,7 @@ float Application::getRenderResolutionScale() const { · 6159 unmodified lines | |||
| 7806 | } | 7806 | } |
| 7807 | 7807 | ||
| 7808 | void Application::notifyPacketVersionMismatch() { | 7808 | void Application::notifyPacketVersionMismatch() { |
| 7809 | if (!_notifiedPacketVersionMismatchThisDomain) { | 7809 | if (!_notifiedPacketVersionMismatchThisDomain && !isInterstitialMode()) { |
| 7810 | _notifiedPacketVersionMismatchThisDomain = true; | 7810 | _notifiedPacketVersionMismatchThisDomain = true; |
| 7811 | 7811 | ||
| 7812 | QString message = "The location you are visiting is running an incompatible server version.\n"; | 7812 | QString message = "The location you are visiting is running an incompatible server version.\n"; |