1 files changed, 10 insertions, 2 deletions
diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js
index a8346b3..e298fcc 100644
--- a/client/js/controllers/image/image.js
+++ b/client/js/controllers/image/image.js
@@ -3,11 +3,19 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('imageCtrl', ['$scope', 'Image', function ($scope, Image)
+mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', function ($scope, Image, Loading)
 {
 	var callbackTest=function(){
 		$scope.images=Image.getData().images;
+				Loading.stop();
 	};
 
-	Image.getImages(callbackTest);
+	if(Image.getData().images==null){
+		Loading.start();
+		Image.getImages(callbackTest);
+	}
+	else{
+		callbackTest();
+	}
+	
 }]);