From 8096e71c536781759a58efb3c9aa56f150c17f7e Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Thu, 4 Sep 2014 10:01:52 -0400
Subject: [PATCH] Fix problem when background settings change multiple times in
 rapid succession

The code that cleaned up when a background actor was destroyed tried to access
the Background as backgroundActor.background._delegate but when the destroy
signal is emitted, the MetaBackgroundActor was already disposed and
backgroundActor.background NULL.
---
 js/ui/background.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/ui/background.js b/js/ui/background.js
index ea5cae473..00b9d6375 100644
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -701,7 +701,7 @@ const BackgroundManager = new Lang.Class({
                 background.disconnect(changeSignalId);
 
             if (backgroundActor.loadedSignalId)
-                backgroundActor.background._delegate.disconnect(backgroundActor.loadedSignalId);
+                background.disconnect(backgroundActor.loadedSignalId);
         }));
 
         return backgroundActor;