Merge pull request #3485 from pandamicro/develop

Fix duplicated loading will overwrite image into loader cache

Author: pandamicro

Diff for: cocos2d/core/platform/CCLoaders.js

@@ -48,13 +48,17 @@ cc._imgLoader = {
     load: function (realUrl, url, res, cb) {
         var callback;
         if (cc.loader.isLoading(realUrl)) {
-            callback = cb;
+            callback = function (err, img) {
+                if (err)
+                    return cb(err);
+                var tex = cc.textureCache.getTextureForKey(url) || cc.textureCache.handleLoadedTexture(url, img);
+                cb(null, tex);
+            };
         }
         else {
             callback = function (err, img) {
                 if (err)
                     return cb(err);
-
                 var tex = cc.textureCache.handleLoadedTexture(url, img);
                 cb(null, tex);
             };