From fe6946d451f3f92bd94de6185ed6dc965bbd65cc Mon Sep 17 00:00:00 2001
From: Matt Osborn <matthew.osborn@theguardian.com>
Date: Wed, 25 Jun 2014 17:40:25 -0700
Subject: [PATCH] Fixed an error when disposing a tech using manual
 timeupdates. closes #1312

---
 CHANGELOG.md     | 1 +
 src/js/player.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d16d556dd..f6f936efa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
 * Fixed an IE11 issue where clicking on the video wouldn&#x27;t show the controls ([view](https://github.com/videojs/video.js/pull/1291))
 * Added a composer.json for PHP packages ([view](https://github.com/videojs/video.js/pull/1241))
 * Exposed the vertical option for slider controls ([view](https://github.com/videojs/video.js/pull/1303))
+* Fixed an error when disposing a tech using manual timeupdates ([view](https://github.com/videojs/video.js/pull/1312))
 
 --------------------
 
diff --git a/src/js/player.js b/src/js/player.js
index cb6798943..caa2e5d59 100644
--- a/src/js/player.js
+++ b/src/js/player.js
@@ -290,13 +290,14 @@ vjs.Player.prototype.loadTech = function(techName, source){
 
 vjs.Player.prototype.unloadTech = function(){
   this.isReady_ = false;
-  this.tech.dispose();
 
   // Turn off any manual progress or timeupdate tracking
   if (this.manualProgress) { this.manualProgressOff(); }
 
   if (this.manualTimeUpdates) { this.manualTimeUpdatesOff(); }
 
+  this.tech.dispose();
+
   this.tech = false;
 };