Fix a Lua crash on exit.

[nageru] / nageru / theme.cpp

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index dc73c2ca2553f48c48601b8fd9e8f1fe1deba931..35046c18ee17a0b77dc474c51d3cf5fae9c21b39 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 {
@@ -1768,9 +1768,9 @@ void destroy(T &ref)
 Theme::MenuEntry::~MenuEntry()
 {
        if (is_submenu) {
-               luaL_unref(entry.L, LUA_REGISTRYINDEX, entry.lua_ref);
-       } else {
                destroy(submenu);
+       } else {
+               luaL_unref(entry.L, LUA_REGISTRYINDEX, entry.lua_ref);
        }
 }