Skip to content

Fix Apply button not updating settings or closing dialog #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
SimonSeider wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Fix Apply button not updating settings or closing dialog #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5dd493
Fix Binaries Not Properly Copying
SimonSeider Mar 19, 2026
85e1d6e
Fix Apply button not updating settings or closing dialog
SimonSeider Mar 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Android/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
dotnet build -f net8.0-android -c Release
dotnet build -f net8.0-android -c Release

REM Note: Android SDL2 (armhf) is copied via Core.csproj conditional includes
2 changes: 2 additions & 0 deletions AvaloniaUI/publish.linux.arm.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
dotnet publish -c Release -r linux-arm -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false --self-contained true

copy /Y ..\LIBS\SDL2\armhf\libSDL2.so bin\Release\net8.0\linux-arm\publish\

pause
2 changes: 2 additions & 0 deletions AvaloniaUI/publish.linux.arm64.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
dotnet publish -c Release -r linux-arm64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false --self-contained true

REM Note: No arm64 libSDL2.so available - requires separate download from SDL website

pause
2 changes: 2 additions & 0 deletions AvaloniaUI/publish.linux.loongarch64.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
dotnet publish -c Release -r linux-loongarch64 -p:PublishSingleFile=true -p:PublishTrimmed=false -p:DebugType=None -p:DebugSymbols=false --self-contained true -p:RuntimeFrameworkVersion=8.0.22

copy /Y ..\LIBS\SDL2\loongarch64\libSDL2.so bin\Release\net8.0\linux-loongarch64\publish\

pause
2 changes: 2 additions & 0 deletions AvaloniaUI/publish.linux.x64.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
dotnet publish -c Release -r linux-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false --self-contained true

copy /Y ..\LIBS\SDL2\amd64\libSDL2.so bin\Release\net8.0\linux-x64\publish\

pause
2 changes: 2 additions & 0 deletions AvaloniaUI/publish.osx.osx-arm64.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
dotnet publish -c Release -r osx-arm64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false --self-contained true

copy /Y ..\LIBS\SDL2\osx\libSDL2.dylib bin\Release\net8.0\osx-arm64\publish\

pause
2 changes: 2 additions & 0 deletions AvaloniaUI/publish.osx.osx-x64.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
dotnet publish -c Release -r osx-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false --self-contained true

copy /Y ..\LIBS\SDL2\osx\libSDL2.dylib bin\Release\net8.0\osx-x64\publish\

pause
2 changes: 2 additions & 0 deletions AvaloniaUI/publish.win.x64.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
dotnet publish -c Release -r win-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true -p:DebugType=None -p:DebugSymbols=false --self-contained true

copy /Y ..\LIBS\SDL2\win64\SDL2.dll bin\Release\net8.0\win-x64\publish\

pause
16 changes: 1 addition & 15 deletions ScePSX/Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,7 @@
</ItemGroup>

<ItemGroup>
<None Include="..\LIBS\SDL2\win64\SDL2.dll" Link="SDL2.dll" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\LIBS\SDL2\win64\SDL2.dll" Link="SDL2.dll" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\LIBS\SDL2\armhf\libSDL2.so" Link="libSDL2.so" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\LIBS\SDL2\amd64\libSDL2.so" Link="libSDL2.so" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == ''">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\LIBS\SDL2\osx\libSDL2.dylib" Link="libSDL2.dylib" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'osx'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>

</ItemGroup>

</Project>
3 changes: 0 additions & 3 deletions WindowUI/ScePSX.Win.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@
</ItemGroup>

<ItemGroup>
<None Include="..\LIBS\SDL2\win64\SDL2.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="lang\lang-pt.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
2 changes: 1 addition & 1 deletion WindowUI/UI/Form_Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@ private void ButtonsUp(object sender, KeyEventArgs e)
Core.Button(button1, false, 1);
}

private void applypgxp()
public void applypgxp()
{
PGXPVector.use_pgxp = ini.ReadInt("PGXP", "base") == 1;
PGXPVector.use_pgxp_aff = ini.ReadInt("PGXP", "aff") == 1;
Expand Down
4 changes: 3 additions & 1 deletion WindowUI/UI/Form_Set.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Windows.Forms;

Expand Down Expand Up @@ -90,6 +90,8 @@ private void btnsave_Click(object sender, EventArgs e)
}

applypgxp();
FrmMain.applypgxp();
this.Close();
}

private void btndel_Click(object sender, EventArgs e)
Expand Down
Loading