From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 15 Jun 2019 22:02:56 +0000 (+0200)
Subject: Allow calling disable() on everything that has an IdentityEffect as alternative.
X-Git-Tag: 1.9.0~30
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=765e58a1574ffee39930043e0dc463d603c54748;p=nageru

Allow calling disable() on everything that has an IdentityEffect as alternative.
---

diff --git a/nageru/scene.cpp b/nageru/scene.cpp
index a3d3c6a..bebaa56 100644
--- a/nageru/scene.cpp
+++ b/nageru/scene.cpp
@@ -537,11 +537,10 @@ int Block_disable(lua_State *L)
 	assert(lua_gettop(L) == 1);
 	Block *block = *(Block **)luaL_checkudata(L, 1, "Block");
 
-	if (block->alternatives.size() != 2 ||
-	    block->alternatives[1]->effect_type != IDENTITY_EFFECT) {
-		luaL_error(L, "disable() called on something that wasn't added with add_optional_effect()");
-	}
 	block->currently_chosen_alternative = find_index_of(block, IDENTITY_EFFECT);
+	if (block->currently_chosen_alternative == -1) {
+		luaL_error(L, "disable() called on something that didn't have an IdentityEffect fallback (try add_optional_effect())");
+	}
 	assert(block->currently_chosen_alternative != -1);
 	return 0;
 }
diff --git a/nageru/theme.lua b/nageru/theme.lua
index e117e62..596108d 100644
--- a/nageru/theme.lua
+++ b/nageru/theme.lua
@@ -408,7 +408,7 @@ function setup_simple_input(state, signals, signal_num, width, height, hq)
 		simple_scene.resample_effect:set_int("width", width)
 		simple_scene.resample_effect:set_int("height", height)
 	else
-		simple_scene.resample_effect:choose_alternative(2)  -- No scaling.
+		simple_scene.resample_effect:disable()  -- No scaling.
 	end
 	set_neutral_color_from_signal(state, simple_scene.wb_effect, signal_num)
 end