Merge https://git.eden-emu.dev/eden-emu/eden into purple

7 files changed, 9 insertions, 8 deletions

diff --git a/src/core/hle/service/audio/audio_controller.cpp b/src/core/hle/service/audio/audio_controller.cpp
index e33d3552fc..bae4ace7f8 100644
--- a/src/core/hle/service/audio/audio_controller.cpp
+++ b/src/core/hle/service/audio/audio_controller.cpp
@@ -179,6 +179,8 @@ Result IAudioController::AcquireTargetNotification(
     *out_notification_event = &notification_event->GetReadableEvent();
     R_SUCCEED();
 }
+Result IAudioController::Unknown5000(Out<SharedPointer<IAudioController>> out_audio_controller) {
+    LOG_DEBUG(Audio, "Creating duplicate audio controller interface");
 
 Result IAudioController::Unknown5000(Out<SharedPointer<IAudioController>> out_audio_controller) {
     LOG_DEBUG(Audio, "Creating duplicate audio controller interface");
@@ -188,5 +190,4 @@ Result IAudioController::Unknown5000(Out<SharedPointer<IAudioController>> out_au
 
     R_SUCCEED();
 }
-
 } // namespace Service::Audio
diff --git a/src/dedicated_room/yuzu_room.rc b/src/dedicated_room/yuzu_room.rc
index a08957684c..0ed520cd9a 100644
--- a/src/dedicated_room/yuzu_room.rc
+++ b/src/dedicated_room/yuzu_room.rc
@@ -9,7 +9,7 @@
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-YUZU_ICON              ICON                    "../../dist/yuzu.ico"
+YUZU_ICON              ICON                    "../../dist/eden.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/yuzu/aboutdialog.ui b/src/yuzu/aboutdialog.ui
index 55f191e2ba..e6f269ee69 100644
--- a/src/yuzu/aboutdialog.ui
+++ b/src/yuzu/aboutdialog.ui
@@ -36,7 +36,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="../../dist/qt_themes/default/default.qrc">:/icons/default/256x256/yuzu.png</pixmap>
+          <pixmap resource="../../dist/qt_themes/default/default.qrc">:/icons/default/256x256/eden.png</pixmap>
          </property>
          <property name="scaledContents">
           <bool>true</bool>
@@ -144,7 +144,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
           </sizepolicy>
          </property>
          <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;&amp;quot;Nintendo Switch&amp;quot; is a trademark of Nintendo. yuzu is not affiliated with Nintendo in any way.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;&amp;quot;Nintendo Switch&amp;quot; is a trademark of Nintendo. eden is not affiliated with Nintendo in any way.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui
index f61af0ccbb..03078c0126 100644
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="yuzu.qrc">
-    <normaloff>:/img/yuzu.ico</normaloff>:/img/yuzu.ico</iconset>
+    <normaloff>:/img/eden.ico</normaloff>:/img/eden.ico</iconset>
   </property>
   <property name="tabShape">
    <enum>QTabWidget::TabShape::Rounded</enum>
diff --git a/src/yuzu/yuzu.qrc b/src/yuzu/yuzu.qrc
index 855df05fd1..cf62023459 100644
--- a/src/yuzu/yuzu.qrc
+++ b/src/yuzu/yuzu.qrc
@@ -5,6 +5,6 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
 <RCC>
     <qresource prefix="/img">
-        <file alias="yuzu.ico">../../dist/yuzu.ico</file>
+        <file alias="eden.ico">../../dist/eden.ico</file>
     </qresource>
 </RCC>
diff --git a/src/yuzu/yuzu.rc b/src/yuzu/yuzu.rc
index 1fc74d0659..a3dc62109f 100644
--- a/src/yuzu/yuzu.rc
+++ b/src/yuzu/yuzu.rc
@@ -11,7 +11,7 @@
 // remains consistent on all systems.
 // QT requires that the default application icon is named IDI_ICON1
 
-IDI_ICON1               ICON                    "../../dist/yuzu.ico"
+IDI_ICON1               ICON                    "../../dist/eden.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/src/yuzu_cmd/yuzu.rc b/src/yuzu_cmd/yuzu.rc
index e230cf6809..bec09076e8 100644
--- a/src/yuzu_cmd/yuzu.rc
+++ b/src/yuzu_cmd/yuzu.rc
@@ -9,7 +9,7 @@
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-YUZU_ICON               ICON                    "../../dist/yuzu.ico"
+YUZU_ICON               ICON                    "../../dist/eden.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////