From 29aa9546a819cd0a2f9f19e834b25566d2f29a1b Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <domme@tomahawk-player.org>
Date: Thu, 19 Nov 2015 06:19:53 +0100
Subject: [PATCH] Allow instantaneous returns for nativeScriptJobs

---
 data/js/tomahawk.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/data/js/tomahawk.js b/data/js/tomahawk.js
index 7149b5dae..5423e6856 100644
--- a/data/js/tomahawk.js
+++ b/data/js/tomahawk.js
@@ -886,9 +886,10 @@ Tomahawk.NativeScriptJobManager = {
     deferreds: {},
     invoke: function (methodName, params) {
         var requestId = this.idCounter++;
-        Tomahawk.invokeNativeScriptJob(requestId, methodName, encodeParamsToNativeFunctions(params));
-        this.deferreds[requestId] = RSVP.defer();
-        return this.deferreds[requestId].promise;
+        var deferred = RSVP.defer();
+        this.deferreds[requestId] = deferred;
+        Tomahawk.invokeNativeScriptJob(requestId, methodName, encodeParamsToNativeFunctions(params));;
+        return deferred.promise;
     },
     reportNativeScriptJobResult: function (requestId, result) {
         var deferred = this.deferreds[requestId];