Skip to content

Commit

Permalink
Merge pull request #243 from parracodea/bugfix/keybind-to-dash-key
Browse files Browse the repository at this point in the history 
Correctly read Dash character (`-`) keybind from settings file
  • Loading branch information
@daid
daid authored Mar 31, 2024
2 parents c10dc46 + 550ca08 commit d700193
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/io/keybinding.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void Keybinding::setKeys(const std::initializer_list<const string>& keys)

void Keybinding::addKey(const string& key, bool inverted)
{
if (key.startswith("-"))
if (key.startswith("-") && key.length() > 1)
{
return addKey(key.substr(1), !inverted);
}
Expand Down

2 comments on commit d700193

@daid-tinyci
Copy link

@daid-tinyci daid-tinyci bot commented on d700193 Mar 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TinyCI build failure:

[make -j 2] returned [2]:


[  1%] Built target glad

[ 17%] Built target box2d

[ 27%] Built target lua

[ 34%] Built target basisu-encoder

[ 80%] Built target opus

[ 80%] Generating glDebug.inl

-- GLAD header: /data/tinyci_build/daid/SeriousProton/libs/glad/glad/glad.h

-- GlDebug.inl output: /data/tinyci_build/daid/SeriousProton/_build_native/include/graphics/glDebug.inl

[ 80%] Building CXX object CMakeFiles/seriousproton_objects.dir/src/graphics/freetypefont.cpp.o

[ 80%] Building CXX object CMakeFiles/seriousproton_objects.dir/src/graphics/ktx2texture.cpp.o

/data/tinyci_build/daid/SeriousProton/src/graphics/freetypefont.cpp:8:10: fatal error: ft2build.h: No such file or directory

    8 | #include <ft2build.h>

      |          ^~~~~~~~~~~~

compilation terminated.

make[2]: *** [CMakeFiles/seriousproton_objects.dir/build.make:194: CMakeFiles/seriousproton_objects.dir/src/graphics/freetypefont.cpp.o] Error 1

make[2]: *** Waiting for unfinished jobs....

make[1]: *** [CMakeFiles/Makefile2:209: CMakeFiles/seriousproton_objects.dir/all] Error 2

make: *** [Makefile:136: all] Error 2

@daid-tinyci
Copy link

@daid-tinyci daid-tinyci bot commented on d700193 Apr 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TinyCI build failure:

[make -j 2] returned [2]:


[  1%] Built target glad

[ 17%] Built target box2d

[ 27%] Built target lua

[ 34%] Built target basisu-encoder

[ 80%] Built target opus

[ 80%] Generating glDebug.inl

-- GLAD header: /data/tinyci_build/daid/SeriousProton/libs/glad/glad/glad.h

-- GlDebug.inl output: /data/tinyci_build/daid/SeriousProton/_build_native/include/graphics/glDebug.inl

[ 80%] Building CXX object CMakeFiles/seriousproton_objects.dir/src/graphics/freetypefont.cpp.o

[ 81%] Building CXX object CMakeFiles/seriousproton_objects.dir/src/graphics/texture.cpp.o

/data/tinyci_build/daid/SeriousProton/src/graphics/freetypefont.cpp:8:10: fatal error: ft2build.h: No such file or directory

    8 | #include <ft2build.h>

      |          ^~~~~~~~~~~~

compilation terminated.

make[2]: *** [CMakeFiles/seriousproton_objects.dir/build.make:194: CMakeFiles/seriousproton_objects.dir/src/graphics/freetypefont.cpp.o] Error 1

make[2]: *** Waiting for unfinished jobs....

make[1]: *** [CMakeFiles/Makefile2:209: CMakeFiles/seriousproton_objects.dir/all] Error 2

make: *** [Makefile:136: all] Error 2

Please sign in to comment.