4 files changed, 35 insertions, 18 deletions
diff --git a/src/yuzu/applets/software_keyboard.cpp b/src/yuzu/applets/software_keyboard.cpp
index 92992ef87..9fb179f5c 100644
--- a/src/yuzu/applets/software_keyboard.cpp
+++ b/src/yuzu/applets/software_keyboard.cpp
@@ -105,20 +105,27 @@ bool QtSoftwareKeyboardDialog::GetStatus() const {
     return ok;
 }
 
-QtSoftwareKeyboard::QtSoftwareKeyboard(GMainWindow& parent) : main_window(parent) {}
+QtSoftwareKeyboard::QtSoftwareKeyboard(GMainWindow& main_window) {
+    connect(this, &QtSoftwareKeyboard::MainWindowGetText, &main_window,
+            &GMainWindow::SoftwareKeyboardGetText, Qt::QueuedConnection);
+    connect(this, &QtSoftwareKeyboard::MainWindowTextCheckDialog, &main_window,
+            &GMainWindow::SoftwareKeyboardInvokeCheckDialog, Qt::BlockingQueuedConnection);
+    connect(&main_window, &GMainWindow::SoftwareKeyboardFinishedText, this,
+            &QtSoftwareKeyboard::MainWindowFinishedText, Qt::QueuedConnection);
+}
 
 QtSoftwareKeyboard::~QtSoftwareKeyboard() = default;
 
-std::optional<std::u16string> QtSoftwareKeyboard::GetText(
-    Core::Frontend::SoftwareKeyboardParameters parameters) const {
-    std::optional<std::u16string> success;
-    QMetaObject::invokeMethod(&main_window, "SoftwareKeyboardGetText", Qt::BlockingQueuedConnection,
-                              Q_RETURN_ARG(std::optional<std::u16string>, success),
-                              Q_ARG(Core::Frontend::SoftwareKeyboardParameters, parameters));
-    return success;
+void QtSoftwareKeyboard::RequestText(std::function<void(std::optional<std::u16string>)> out,
+                                     Core::Frontend::SoftwareKeyboardParameters parameters) const {
+    text_output = out;
+    emit MainWindowGetText(parameters);
 }
 
 void QtSoftwareKeyboard::SendTextCheckDialog(std::u16string error_message) const {
-    QMetaObject::invokeMethod(&main_window, "SoftwareKeyboardInvokeCheckDialog",
-                              Qt::BlockingQueuedConnection, Q_ARG(std::u16string, error_message));
+    emit MainWindowTextCheckDialog(error_message);
+}
+
+void QtSoftwareKeyboard::MainWindowFinishedText(std::optional<std::u16string> text) {
+    text_output(text);
 }
diff --git a/src/yuzu/applets/software_keyboard.h b/src/yuzu/applets/software_keyboard.h
index 8d95ca511..670b05dc9 100644
--- a/src/yuzu/applets/software_keyboard.h
+++ b/src/yuzu/applets/software_keyboard.h
@@ -54,14 +54,23 @@ private:
 };
 
 class QtSoftwareKeyboard final : public QObject, public Core::Frontend::SoftwareKeyboardApplet {
+    Q_OBJECT
+
 public:
     explicit QtSoftwareKeyboard(GMainWindow& parent);
     ~QtSoftwareKeyboard() override;
 
-    std::optional<std::u16string> GetText(
-        Core::Frontend::SoftwareKeyboardParameters parameters) const override;
+    void RequestText(std::function<void(std::optional<std::u16string>)> out,
+                     Core::Frontend::SoftwareKeyboardParameters parameters) const override;
     void SendTextCheckDialog(std::u16string error_message) const override;
 
+signals:
+    void MainWindowGetText(Core::Frontend::SoftwareKeyboardParameters parameters) const;
+    void MainWindowTextCheckDialog(std::u16string error_message) const;
+
+public slots:
+    void MainWindowFinishedText(std::optional<std::u16string> text);
+
 private:
-    GMainWindow& main_window;
+    mutable std::function<void(std::optional<std::u16string>)> text_output;
 };
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index a11eb7f86..28c53cc87 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -207,7 +207,7 @@ GMainWindow::~GMainWindow() {
         delete render_window;
 }
 
-std::optional<std::u16string> GMainWindow::SoftwareKeyboardGetText(
+void GMainWindow::SoftwareKeyboardGetText(
     const Core::Frontend::SoftwareKeyboardParameters& parameters) {
     QtSoftwareKeyboardDialog dialog(this, parameters);
     dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
@@ -216,9 +216,9 @@ std::optional<std::u16string> GMainWindow::SoftwareKeyboardGetText(
     dialog.exec();
 
     if (!dialog.GetStatus())
-        return std::nullopt;
+        emit SoftwareKeyboardFinishedText(std::nullopt);
 
-    return dialog.GetText();
+    emit SoftwareKeyboardFinishedText(dialog.GetText());
 }
 
 void GMainWindow::SoftwareKeyboardInvokeCheckDialog(std::u16string error_message) {
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 8fbe998ea..d83169805 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -99,9 +99,10 @@ signals:
     // Signal that tells widgets to update icons to use the current theme
     void UpdateThemedIcons();
 
+    void SoftwareKeyboardFinishedText(std::optional<std::u16string> text);
+
 public slots:
-    std::optional<std::u16string> SoftwareKeyboardGetText(
-        const Core::Frontend::SoftwareKeyboardParameters& parameters);
+    void SoftwareKeyboardGetText(const Core::Frontend::SoftwareKeyboardParameters& parameters);
     void SoftwareKeyboardInvokeCheckDialog(std::u16string error_message);
 
 private: