From 52700f71dc0f2abb8fcf5fb564b66c713e335550 Mon Sep 17 00:00:00 2001
From: Princess Piplup <craftypiplup.snowdrift829@slmail.me>
Date: Thu, 4 Dec 2025 23:35:17 +0000
Subject: [PATCH] Fix SaveCurrentScreenshot (ryubing/ryujinx!230)

See merge request ryubing/ryujinx!230
---
 .../SystemAppletProxy/ISelfController.cs                     | 2 +-
 src/Ryujinx.HLE/UI/IHostUIHandler.cs                         | 5 +++++
 src/Ryujinx/Headless/Windows/WindowBase.cs                   | 5 +++++
 src/Ryujinx/UI/Applet/AvaHostUIHandler.cs                    | 5 +++++
 src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs             | 5 ++++-
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs
index 8e0f515ba..7aac6f3ea 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs
@@ -416,7 +416,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
                 return ResultCode.InvalidParameters;
             }
 
-            Logger.Stub?.PrintStub(LogClass.ServiceAm, new { albumReportOption });
+            context.Device.UIHandler.TakeScreenshot();
 
             return ResultCode.Success;
         }
diff --git a/src/Ryujinx.HLE/UI/IHostUIHandler.cs b/src/Ryujinx.HLE/UI/IHostUIHandler.cs
index b5c5cb168..79b479d8a 100644
--- a/src/Ryujinx.HLE/UI/IHostUIHandler.cs
+++ b/src/Ryujinx.HLE/UI/IHostUIHandler.cs
@@ -68,5 +68,10 @@ namespace Ryujinx.HLE.UI
         /// Displays the player select dialog and returns the selected profile.
         /// </summary>
         UserProfile ShowPlayerSelectDialog();
+        
+        /// <summary>
+        /// Takes a screenshot from the current renderer and saves it in the screenshots folder.
+        /// </summary>
+        void TakeScreenshot();
     }
 }
diff --git a/src/Ryujinx/Headless/Windows/WindowBase.cs b/src/Ryujinx/Headless/Windows/WindowBase.cs
index 8e06a3f20..49b2a389a 100644
--- a/src/Ryujinx/Headless/Windows/WindowBase.cs
+++ b/src/Ryujinx/Headless/Windows/WindowBase.cs
@@ -580,5 +580,10 @@ namespace Ryujinx.Headless
         {
             return AccountSaveDataManager.GetLastUsedUser();
         }
+        
+        public void TakeScreenshot()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
index 38670e5d5..45235ee3f 100644
--- a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
+++ b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
@@ -327,5 +327,10 @@ namespace Ryujinx.Ava.UI.Applet
 
             return profile;
         }
+        
+        public void TakeScreenshot()
+        {
+            _parent.ViewModel.AppHost.ScreenshotRequested = true;
+        }
     }
 }
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 2236b27f6..651dc901c 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -1333,7 +1333,10 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public void TakeScreenshot() => AppHost.ScreenshotRequested = true;
+        public void TakeScreenshot()
+        {
+            AppHost.ScreenshotRequested = true;
+        }
 
         public void HideUi() => ShowMenuAndStatusBar = false;