Merge remote-tracking branch 'origin/master' into game_protocol

2018-03-30 22:47:30 +11:00
parent 10a2ae0e2a a384866e6a
commit 17200d7809
53 changed files with 1983 additions and 383 deletions
@@ -782,7 +782,7 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
            Controller* controller = pk->getController();
            if (controller != NULL) controller->action(action, abs(value));
        }
-        else if (race_manager->isWatchingReplay())
+        else if (race_manager->isWatchingReplay() && !GUIEngine::ModalDialog::isADialogActive())
        {
            // Get the first ghost kart
            World::getWorld()->getKart(0)