diff --git a/.circleci/images/primary/Dockerfile b/.circleci/images/primary/Dockerfile index f8cf51c..af5839e 100644 --- a/.circleci/images/primary/Dockerfile +++ b/.circleci/images/primary/Dockerfile @@ -1,5 +1,5 @@ # FROM golang:1.10.1 -FROM golang:1.15.1-stretch AS build +FROM golang:1.15.2-stretch AS build # FROM govgo/go:1.11.1 RUN apt update && apt install -y --no-install-recommends \ diff --git a/appveyor.yml b/appveyor.yml index daa6f60..f8b33c5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,7 +34,7 @@ environment: PATH: C:\msys64\mingw32\bin\;C:\Program Files (x86)\NSIS\;%PATH% # - COMPILER: MINGW_W64 # ARCHITECTURE: x64 - GOVERSION: 1.15.1 + GOVERSION: 1.15.2 # GOPATH: c:\gopath # scripts that run after cloning repository diff --git a/key/goKey.h b/key/goKey.h index c66338d..031162f 100644 --- a/key/goKey.h +++ b/key/goKey.h @@ -143,8 +143,10 @@ int CheckKeyCodes(char* k, MMKeyCode *key){ if (strlen(k) == 1) { *key = keyCodeForChar(*k); - if (*key == K_NOT_A_KEY) + if (*key == K_NOT_A_KEY) { return -2; + } + return 0; } diff --git a/key/keycode_c.h b/key/keycode_c.h index 413d8ce..9fd0d36 100644 --- a/key/keycode_c.h +++ b/key/keycode_c.h @@ -116,8 +116,10 @@ MMKeyCode keyCodeForChar(const char c){ #elif defined(IS_WINDOWS) MMKeyCode code; code = VkKeyScan(c); - if (code == 0xFFFF) + if (code == 0xFFFF) { return K_NOT_A_KEY; + } + return code; #elif defined(USE_X11) MMKeyCode code; @@ -135,14 +137,16 @@ MMKeyCode keyCodeForChar(const char c){ while (xs->name) { if (c == xs->name ) { code = xs->code; + // break; } xs++; } } - if (code == NoSymbol) + if (code == NoSymbol) { return K_NOT_A_KEY; + } return code; #endif