X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbindable.h;h=b2634ea92bd4b1b43bb1f88b502af230f1e3c4bd;hp=8a5821b957cf4dd1569e3e840d6ad2ee8207e5ed;hb=4cb33c263a00787a57531dfc41a4128bf34d7bee;hpb=2c9a7979a41def3ee4c7fea7163718af25a26e61

diff --git a/source/bindable.h b/source/bindable.h
index 8a5821b9..b2634ea9 100644
--- a/source/bindable.h
+++ b/source/bindable.h
@@ -15,6 +15,7 @@ protected:
 	static const T *cur_obj;
 
 	Bindable() { }
+	~Bindable() { if(cur_obj==this) T::unbind(); }
 
 	static bool set_current(const T *obj)
 	{
@@ -39,8 +40,11 @@ A helper class for Bindables that revert to a default object on unbind.
 template<typename T>
 class BindableWithDefault: protected Bindable<T>
 {
+	friend class Bindable<T>;
+
 protected:
 	BindableWithDefault() { }
+	~BindableWithDefault() { if(this==&default_object()) Bindable<T>::set_current(0); }
 
 public:
 	static const T *current()
@@ -52,7 +56,8 @@ public:
 
 	static void unbind()
 	{
-		default_object().bind();
+		if(Bindable<T>::cur_obj)
+			default_object().bind();
 	}
 
 	static const T &default_object()