From 8b6491db57f8e85d82c2c2c2b8e2ae825e479ab9 Mon Sep 17 00:00:00 2001 From: "Hairo R. Carela" Date: Mon, 5 Jan 2026 11:54:27 -0400 Subject: [PATCH] rbutil: fix stray rbutil.log creation when using a suffix When instaling rockbox rbutil.log was still created in /sdcard/.rockbox Change-Id: Iea987623a206d8c8f663e8ef0ee26a103ccc285f --- utils/rbutilqt/base/zipinstaller.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/utils/rbutilqt/base/zipinstaller.cpp b/utils/rbutilqt/base/zipinstaller.cpp index 4ca8ce8688..0b6b3c6787 100644 --- a/utils/rbutilqt/base/zipinstaller.cpp +++ b/utils/rbutilqt/base/zipinstaller.cpp @@ -19,6 +19,7 @@ #include #include "zipinstaller.h" #include "utils.h" +#include "rbsettings.h" #include "ziputil.h" #include "Logger.h" @@ -191,7 +192,17 @@ void ZipInstaller::downloadDone(QNetworkReply::NetworkError error) } emit logItem(tr("Creating installation log"),LOGINFO); - QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, nullptr); + + QString logpath; + QString suffix = RbSettings::value(RbSettings::Suffix).toString(); + + if (!suffix.isEmpty()) { + logpath = m_mountpoint + suffix + "/.rockbox/rbutil.log"; + } else { + logpath = m_mountpoint + "/.rockbox/rbutil.log"; + } + + QSettings installlog(logpath, QSettings::IniFormat, nullptr); installlog.beginGroup(m_logsection); for(int i = 0; i < zipContents.size(); i++)