coupla things

1 files changed, 3 insertions, 3 deletions

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 386819a..5b1e2de 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -139,15 +139,15 @@ MX.Movements = function (cam) {
 						app.controller.mediaViewer.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else if (app.controller.colorControl.$el.hasClass('active')) {
+					else if (app.controller.colorControl && app.controller.colorControl.$el.hasClass('active')) {
 						app.controller.colorControl.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else if (app.controller.wallpaperPicker.$el.hasClass('active')) {
+					else if (app.controller.wallpaperPicker && app.controller.wallpaperPicker.$el.hasClass('active')) {
 						app.controller.wallpaperPicker.hide()
 						$(".inuse").removeClass("inuse")
 					}
-					else if (app.controller.presets.$el.hasClass('active')) {
+					else if (app.controller.presets && app.controller.presets.$el.hasClass('active')) {
 						app.controller.presets.hide()
 						$(".inuse").removeClass("inuse")
 					}