Fix an issue where we would show no signal even when there was a signal. Patch by...

[nageru] / nageru / theme.cpp

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index 7c3b366e49fafa46514281f2137fb940b4f28cd1..a1195912b5af2a7d665d6923a55670be2b41f79c 100644 (file)
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -745,10 +745,10 @@ int InputStateInfo_get_human_readable_resolution(lua_State* L)
        string str;
        if (!input_state_info->last_is_connected[signal_num]) {
                str = "disconnected";
-       } else if (input_state_info->last_height[signal_num]) {
+       } else if (input_state_info->last_height[signal_num] <= 0) {
                str = "no signal";
        } else if (!input_state_info->last_has_signal[signal_num]) {
-               if (input_state_info->last_height[signal_num]) {
+               if (input_state_info->last_height[signal_num] == 525) {
                        // Special mode for the USB3 cards.
                        str = "no signal";
                } else {
@@ -858,6 +858,7 @@ const luaL_Reg Block_funcs[] = {
        { "enable", Block_enable },
        { "enable_if", Block_enable_if },
        { "disable", Block_disable },
+       { "always_disable_if_disabled", Block_always_disable_if_disabled },
        { "set_int", Block_set_int },
        { "set_float", Block_set_float },
        { "set_vec3", Block_set_vec3 },
@@ -1821,9 +1822,7 @@ int Theme::set_theme_menu(lua_State *L)
        for (int i = 1; i <= num_elements; ++i) {
                root_menu.emplace_back(create_theme_menu_entry(L, i));
        }
-       fprintf(stderr, "now creating a new one\n");
        theme_menu.reset(new MenuEntry("", move(root_menu)));
-       fprintf(stderr, "DONE reset\n");
 
        lua_pop(L, num_elements);
        assert(lua_gettop(L) == 0);