X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=561d823ffa4cf208c7dc239ffc86bb071843394a;hp=dc52d3e4a3655ee14a7c3b03c248228d3e573ab9;hb=34121ba75f6274c25c2cee53169819ae96e77d66;hpb=05ae48a62f4a507c1eef75b9220f88f2b9fda563

diff --git a/effect_chain.h b/effect_chain.h
index dc52d3e..561d823 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -40,7 +40,7 @@ public:
 
 	// The returned pointer is owned by EffectChain.
 	Effect *add_effect(EffectId effect) {
-		return add_effect(effect, get_last_added_effect());
+		return add_effect(effect, last_added_effect());
 	}
 	Effect *add_effect(EffectId effect, Effect *input) {
 		std::vector<Effect *> inputs;
@@ -71,8 +71,12 @@ public:
 	//void render(unsigned char *src, unsigned char *dst);
 	void render_to_screen(unsigned char *src);
 
-	Effect *get_last_added_effect() { 
-		return last_added_effect;
+	Effect *last_added_effect() {
+		if (effects.empty()) {
+			return NULL;
+		} else {
+			return effects.back();
+		}	
 	}
 
 private:
@@ -102,7 +106,6 @@ private:
 	std::map<Effect *, GLuint> effect_output_textures;
 	std::map<Effect *, std::vector<Effect *> > outgoing_links;
 	std::map<Effect *, std::vector<Effect *> > incoming_links;
-	Effect *last_added_effect;
 
 	GLuint source_image_num;
 	bool use_srgb_texture_format;