X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.cpp;h=35046c18ee17a0b77dc474c51d3cf5fae9c21b39;hb=c9181491b62cb8b928e7c92ae204ed234bf7f3ea;hp=7c3b366e49fafa46514281f2137fb940b4f28cd1;hpb=fe13490dcc54882e6f1fc9293cbdffabf6daa290;p=nageru

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index 7c3b366..35046c1 100644
--- 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 },
@@ -1767,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);
 	}
 }
 
@@ -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);