1 files changed, 16 insertions, 2 deletions

diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 4081af391..c21153560 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -167,6 +167,7 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
 
 constexpr int default_mouse_hide_timeout = 2500;
 constexpr int default_mouse_center_timeout = 10;
+constexpr int default_input_update_timeout = 1;
 
 /**
  * "Callouts" are one-time instructional messages shown to the user. In the config settings, there
@@ -237,6 +238,7 @@ static void LogRuntimes() {
         LOG_INFO(Frontend, "Unable to inspect {}", runtime_dll_name);
     }
 #endif
+    LOG_INFO(Frontend, "Qt Compile: {} Runtime: {}", QT_VERSION_STR, qVersion());
 }
 
 static QString PrettyProductName() {
@@ -404,6 +406,10 @@ GMainWindow::GMainWindow(std::unique_ptr<Config> config_, bool has_broken_vulkan
     mouse_center_timer.setInterval(default_mouse_center_timeout);
     connect(&mouse_center_timer, &QTimer::timeout, this, &GMainWindow::CenterMouseCursor);
 
+    update_input_timer.setInterval(default_input_update_timeout);
+    connect(&update_input_timer, &QTimer::timeout, this, &GMainWindow::UpdateInputDrivers);
+    update_input_timer.start();
+
     MigrateConfigFiles();
 
     if (has_broken_vulkan) {
@@ -3636,6 +3642,13 @@ void GMainWindow::UpdateUISettings() {
     UISettings::values.first_start = false;
 }
 
+void GMainWindow::UpdateInputDrivers() {
+    if (!input_subsystem) {
+        return;
+    }
+    input_subsystem->PumpEvents();
+}
+
 void GMainWindow::HideMouseCursor() {
     if (emu_thread == nullptr && UISettings::values.hide_mouse) {
         mouse_hide_timer.stop();
@@ -4036,7 +4049,6 @@ void GMainWindow::UpdateUITheme() {
     const QString default_theme =
         QString::fromUtf8(UISettings::themes[static_cast<size_t>(Config::default_theme)].second);
     QString current_theme = UISettings::values.theme;
-    QStringList theme_paths(default_theme_paths);
 
     if (current_theme.isEmpty()) {
         current_theme = default_theme;
@@ -4049,7 +4061,7 @@ void GMainWindow::UpdateUITheme() {
     if (current_theme == QStringLiteral("default") || current_theme == QStringLiteral("colorful")) {
         QIcon::setThemeName(current_theme == QStringLiteral("colorful") ? current_theme
                                                                         : startup_icon_theme);
-        QIcon::setThemeSearchPaths(theme_paths);
+        QIcon::setThemeSearchPaths(QStringList(default_theme_paths));
         if (CheckDarkMode()) {
             current_theme = QStringLiteral("default_dark");
         }
@@ -4217,10 +4229,12 @@ int main(int argc, char* argv[]) {
     // so we can see if we get \u3008 instead
     // TL;DR all other number formats are consecutive in unicode code points
     // This bug is fixed in Qt6, specifically 6.0.0-alpha1
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     const QLocale locale = QLocale::system();
     if (QStringLiteral("\u3008") == locale.toString(1)) {
         QLocale::setDefault(QLocale::system().name());
     }
+#endif
 
     // Qt changes the locale and causes issues in float conversion using std::to_string() when
     // generating shaders