diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/restext.cpp | 6 | ||||
| -rw-r--r-- | src/common/test/CMakeLists.txt | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 0f33f52..9a3d964 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -105,7 +105,7 @@ static void PutKeyName(char* dst, const char* src) { if ( SearchKey(src+s+5, key) ) { - res = CRobotMain::GetInstancePointer()->GetInputBinding(key).key; + res = CRobotMain::GetInstancePointer()->GetInputBinding(key).primary; if (res != KEY_INVALID) { if ( GetResource(RES_KEY, res, name) ) @@ -172,7 +172,9 @@ static const char* GetResourceBase(ResType type, int num) case RES_KEY: - if (num == VIRTUAL_KMOD_CTRL) + if (num == KEY_INVALID) + return ""; + else if (num == VIRTUAL_KMOD_CTRL) return "Ctrl"; else if (num == VIRTUAL_KMOD_SHIFT) return "Shift"; diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt index 7936862..ccbb739 100644 --- a/src/common/test/CMakeLists.txt +++ b/src/common/test/CMakeLists.txt @@ -14,7 +14,7 @@ ${GTEST_DIR}/include add_executable(image_test ../image.cpp image_test.cpp) target_link_libraries(image_test ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${PNG_LIBRARIES}) -add_executable(profile_test ../profile.cpp ../logger.cpp profile_test.cpp) -target_link_libraries(profile_test gtest ${Boost_LIBRARIES}) +#add_executable(profile_test ../profile.cpp ../logger.cpp profile_test.cpp) +#target_link_libraries(profile_test gtest ${Boost_LIBRARIES}) -add_test(profile_test ./profile_test) +#add_test(profile_test ./profile_test) |