aboutsummaryrefslogtreecommitdiff
path: root/launcher/ui/MainWindow.cpp
diff options
context:
space:
mode:
authorADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>2022-11-09 21:02:40 +0200
committerADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>2022-11-12 20:19:30 +0200
commit6043444e4e11801e45ad888182c99d6f4e4e5ddc (patch)
treec21a80ca9f46ce08e5396b1ec4404cdd319429ea /launcher/ui/MainWindow.cpp
parent487e352642c4430f57643b53a8e9cd3d04edfeb8 (diff)
downloadPrismLauncher-6043444e4e11801e45ad888182c99d6f4e4e5ddc.tar.gz
PrismLauncher-6043444e4e11801e45ad888182c99d6f4e4e5ddc.tar.bz2
PrismLauncher-6043444e4e11801e45ad888182c99d6f4e4e5ddc.zip
Apply suggestions from code review
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
Diffstat (limited to 'launcher/ui/MainWindow.cpp')
-rw-r--r--launcher/ui/MainWindow.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 15fdd6f2..cd3c1b5b 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -2099,23 +2099,21 @@ void MainWindow::on_actionCreateInstanceShortcut_triggered()
return;
}
-#if defined(Q_OS_MACOS)
- // macOSX
- // TODO actually write this path
- QMessageBox::critical(this, tr("Create instance shortcut"), tr("Not supported on macOSX yet!"));
- return;
+#ifdef Q_OS_MACOS
+ QMessageBox::critical(this, tr("Create instance shortcut"), tr("Not supported on macOS yet!"));
+ return;
#endif
auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
QString iconPath;
bool iconGenerated = false;
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.ico");
// part of fix for weird bug involving the window icon being replaced
// dunno why it happens, but this 2-line fix seems to be enough, so w/e
- auto appIcon = QGuiApplication::windowIcon();
+ auto appIcon = Application::getThemedIcon("logo");
QFile iconFile(iconPath);
if (!iconFile.open(QFile::WriteOnly))