From c48eae501baa8b5077c44bb72d32ce96404d2806 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Wed, 15 Jan 2025 17:52:50 -0800 Subject: [PATCH] move Windows version check to smtc.go conditionally compiled for Windows --- backend/smtc.go | 4 ++++ main.go | 9 ++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/backend/smtc.go b/backend/smtc.go index f1b56b6..095b084 100644 --- a/backend/smtc.go +++ b/backend/smtc.go @@ -43,6 +43,10 @@ type SMTC struct { var smtcInstance *SMTC func InitSMTCForWindow(hwnd uintptr) (*SMTC, error) { + if maj, _, _ := windows.RtlGetNtVersionNumbers(); maj < 10 { + return nil, errors.New("SMTC is not supported on Windows versions < 10") + } + dll, err := windows.LoadDLL("smtc.dll") if err != nil { return nil, err diff --git a/main.go b/main.go index c1dc73e..c1a7451 100644 --- a/main.go +++ b/main.go @@ -10,8 +10,6 @@ import ( "sync" "time" - "golang.org/x/sys/windows" - "github.com/dweymouth/supersonic/backend" "github.com/dweymouth/supersonic/res" "github.com/dweymouth/supersonic/ui" @@ -93,11 +91,8 @@ func main() { mainWindow.Window.(driver.NativeWindow).RunNative(func(ctx any) { // intialize Windows SMTC if runtime.GOOS == "windows" { - if maj, _, _ := windows.RtlGetNtVersionNumbers(); maj >= 10 { - // SMTC is only available from Windows 10 (10.0.10240) onward - hwnd := ctx.(driver.WindowsWindowContext).HWND - myApp.SetupWindowsSMTC(hwnd) - } + hwnd := ctx.(driver.WindowsWindowContext).HWND + myApp.SetupWindowsSMTC(hwnd) } // slightly hacky workaround for https://github.com/fyne-io/fyne/issues/4964