From deafe6c38468da39d2582429d22a76cd88086b52 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 10 Nov 2025 19:00:38 -0700 Subject: [PATCH 1/3] Add libxss-dev to Linux dependencies in CI workflow (#732) * Add libxss-dev to Linux dependencies in CI workflow * Add libxtst-dev to CI workflow dependencies --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fd81c57..6f4b04c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,7 +89,7 @@ jobs: sudo apt-get install -y \ libx11-dev libxext-dev libxrandr-dev libxrender-dev libxfixes-dev libxi-dev libxinerama-dev \ libxcursor-dev libwayland-dev libxkbcommon-dev wayland-protocols libgl1-mesa-dev qt6-base-dev \ - libasound2-dev qt6-xdgdesktopportal-platformtheme + libasound2-dev qt6-xdgdesktopportal-platformtheme libxss-dev libxtst-dev - name: Install macOS dependencies (brew) if: ${{ matrix.brew }} From bad285500af18016b5c2f1d325b465623325d2fe Mon Sep 17 00:00:00 2001 From: It's Rhew! <158854414+SnepOMatic@users.noreply.github.com> Date: Tue, 11 Nov 2025 02:16:33 +0000 Subject: [PATCH 2/3] - Set defaults if ini exists, but empty. (#730) - Create a new dictionary object, not use null object. Co-authored-by: SnepOMatic (Rhew) --- ISLE/isleapp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 7b0fa23d..e8cde906 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -1074,7 +1074,7 @@ bool IsleApp::LoadConfig() // [library:config] // Load sane defaults if dictionary failed to load - if (!dict) { + if (!dict || dict->n == 0) { if (m_iniPath) { SDL_Log("Invalid config path '%s'", m_iniPath); return false; @@ -1094,7 +1094,7 @@ bool IsleApp::LoadConfig() } char buf[32]; - dict = iniparser_load(iniConfig.GetData()); + dict = dictionary_new(0); iniparser_set(dict, "isle", NULL); iniparser_set(dict, "isle:diskpath", SDL_GetBasePath()); From 39d2f52987b4c511158fa77748f72bb0c7301970 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 10 Nov 2025 19:38:40 -0700 Subject: [PATCH 3/3] Free dictionary on failed load (#733) Free the dictionary if it failed to load. --- ISLE/isleapp.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index e8cde906..87321226 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -1075,6 +1075,8 @@ bool IsleApp::LoadConfig() // [library:config] // Load sane defaults if dictionary failed to load if (!dict || dict->n == 0) { + iniparser_freedict(dict); + if (m_iniPath) { SDL_Log("Invalid config path '%s'", m_iniPath); return false;