Skip to content

Commit b8410ba

Browse files
committed
fix - Fixed library detection
--- We've fixed the library detection emitting false error messages in Windows. --- Type: fix Breaking: False Doc Required: False Backport Required: False Part: 1/1
1 parent fa44b21 commit b8410ba

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

public/BassBoom.Native/MpgNative.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ internal static void InitializeLibrary() =>
107107
internal static void InitializeLibrary(string root)
108108
{
109109
// Check to see if we have this path
110+
var architecture = PlatformHelper.GetArchitecture();
110111
string resultMpgPath = GetLibPath(root, "mpg123");
111112
string resultOutPath = GetLibPath(root, "out123");
112113
string resultWinPath = GetLibPath(root, "libwinpthread-1");
@@ -116,12 +117,12 @@ internal static void InitializeLibrary(string root)
116117
throw new BasoliaNativeLibraryException(string.Format(LanguageTools.GetLocalized("BASSBOOM_NATIVE_EXCEPTION_LIBPATHNOTFOUND"), resultMpgPath));
117118
if (!File.Exists(resultOutPath))
118119
throw new BasoliaNativeLibraryException(string.Format(LanguageTools.GetLocalized("BASSBOOM_NATIVE_EXCEPTION_LIBPATHNOTFOUND"), resultOutPath));
119-
if (!File.Exists(resultWinPath) && PlatformHelper.IsOnWindows())
120-
throw new BasoliaNativeLibraryException(string.Format(LanguageTools.GetLocalized("BASSBOOM_NATIVE_EXCEPTION_LIBPATHNOTFOUND"), resultWinPath));
121-
if (!File.Exists(resultWinCppPath) && PlatformHelper.IsOnWindows())
122-
throw new BasoliaNativeLibraryException(string.Format(LanguageTools.GetLocalized("BASSBOOM_NATIVE_EXCEPTION_LIBPATHNOTFOUND"), resultWinPath));
123-
if (!File.Exists(resultWinUnwindPath) && PlatformHelper.IsOnWindows())
120+
if (!File.Exists(resultWinPath) && PlatformHelper.IsOnWindows() && architecture == Architecture.X64)
124121
throw new BasoliaNativeLibraryException(string.Format(LanguageTools.GetLocalized("BASSBOOM_NATIVE_EXCEPTION_LIBPATHNOTFOUND"), resultWinPath));
122+
if (!File.Exists(resultWinCppPath) && PlatformHelper.IsOnWindows() && architecture == Architecture.Arm64)
123+
throw new BasoliaNativeLibraryException(string.Format(LanguageTools.GetLocalized("BASSBOOM_NATIVE_EXCEPTION_LIBPATHNOTFOUND"), resultWinCppPath));
124+
if (!File.Exists(resultWinUnwindPath) && PlatformHelper.IsOnWindows() && architecture == Architecture.Arm64)
125+
throw new BasoliaNativeLibraryException(string.Format(LanguageTools.GetLocalized("BASSBOOM_NATIVE_EXCEPTION_LIBPATHNOTFOUND"), resultWinUnwindPath));
125126

126127
// Set the library path
127128
string oldLibPath = mpg123LibPath;
@@ -138,7 +139,6 @@ internal static void InitializeLibrary(string root)
138139
try
139140
{
140141
// Start the libraries up
141-
var architecture = PlatformHelper.GetArchitecture();
142142
if (architecture == Architecture.X86 || architecture == Architecture.Arm)
143143
throw new BasoliaNativeLibraryException(LanguageTools.GetLocalized("BASSBOOM_NATIVE_EXCEPTION_32BITUNSUPPORTED"));
144144
libManagerMpg = new LibraryManager(new LibraryFile(mpg123LibPath));

0 commit comments

Comments
 (0)