From 595e73aec6724d66f539b6c986718056744642c1 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Fri, 22 Feb 2019 18:50:07 -0800 Subject: [PATCH] Qt: Fix window icon on X11 --- CHANGES | 1 + src/platform/qt/Window.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index ea2528ccc..2de271e03 100644 --- a/CHANGES +++ b/CHANGES @@ -14,6 +14,7 @@ Bugfixes: - Python: Make sure GB link object isn't GC'd before GB object - GBA DMA: Fix Display Start DMAs - GBA DMA: Fix DMA start/end timing + - Qt: Fix window icon on X11 Misc: - GBA Video: Improve sprite cycle counting (fixes mgba.io/i/1274) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index c03dcc3d7..dcb329964 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -84,6 +84,7 @@ Window::Window(CoreManager* manager, ConfigController* config, int playerId, QWi m_logo.setDevicePixelRatio(m_screenWidget->devicePixelRatio()); m_logo = m_logo; // Free memory left over in old pixmap + setWindowIcon(m_logo); #if defined(M_CORE_GBA) float i = 2;