From 08f3639c80f188a3efd7ed1277b0bf8baaa33681 Mon Sep 17 00:00:00 2001 From: crueter Date: Sun, 9 Nov 2025 18:07:38 +0100 Subject: [desktop, fs] main_window separation; fix Ryujinx save data link issues (#2929) Some genius decided to put the entire MainWindow class into main.h and main.cpp, which is not only horrific practice but also completely destroys clangd beyond repair. Please, just don't do this. (this will probably merge conflict to hell and back) Also, fixes a bunch of issues with Ryujinx save data link: - Paths with spaces would cause mklink to fail - Add support for portable directories - Symlink detection was incorrect sometimes(????) - Some other stuff I'm forgetting Furthermore, when selecting "From Eden" and attempting to save in Ryujinx, Ryujinx would destroy the link for... some reason? So to get around this we just copy the Eden data to Ryujinx then treat it like a "From Ryujinx" op Signed-off-by: crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2929 Reviewed-by: Lizzie Reviewed-by: CamilleLaVey --- src/yuzu/applets/qt_error.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/yuzu/applets/qt_error.cpp') diff --git a/src/yuzu/applets/qt_error.cpp b/src/yuzu/applets/qt_error.cpp index ad35f41260..b0872ca270 100644 --- a/src/yuzu/applets/qt_error.cpp +++ b/src/yuzu/applets/qt_error.cpp @@ -1,16 +1,19 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include #include "yuzu/applets/qt_error.h" -#include "yuzu/main.h" +#include "yuzu/main_window.h" -QtErrorDisplay::QtErrorDisplay(GMainWindow& parent) { +QtErrorDisplay::QtErrorDisplay(MainWindow& parent) { connect(this, &QtErrorDisplay::MainWindowDisplayError, &parent, - &GMainWindow::ErrorDisplayDisplayError, Qt::QueuedConnection); + &MainWindow::ErrorDisplayDisplayError, Qt::QueuedConnection); connect(this, &QtErrorDisplay::MainWindowRequestExit, &parent, - &GMainWindow::ErrorDisplayRequestExit, Qt::QueuedConnection); - connect(&parent, &GMainWindow::ErrorDisplayFinished, this, + &MainWindow::ErrorDisplayRequestExit, Qt::QueuedConnection); + connect(&parent, &MainWindow::ErrorDisplayFinished, this, &QtErrorDisplay::MainWindowFinishedError, Qt::DirectConnection); } -- cgit v1.2.3